merge heads

2013-08-12 14:45:00 -07:00
parent 8f35da9576 79a38b2763
commit aed601fcda
9 changed files with 158 additions and 146 deletions
@@ -16,7 +16,7 @@ limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
  android:installLocation="auto"
-  android:versionCode="69"
+  android:versionCode="70"
  android:versionName="2.0.5"
  package="com.google.android.maps.mytracks" >
  <!-- Permission to initialize services -->