Merge heads

2013-07-12 10:43:51 +08:00
parent a484963572
commit f4ccb8dbd4
94 changed files with 829 additions and 750 deletions
@@ -16,7 +16,7 @@ limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
  android:installLocation="auto"
-  android:versionCode="68"
+  android:versionCode="69"
  android:versionName="2.0.5"
  package="com.google.android.maps.mytracks" >
  <!-- Permission to initialize services -->