Merge heads

2013-04-17 19:51:58 +08:00
parent 3d6f9a1a2d
commit d66bf7b395
93 changed files with 840 additions and 734 deletions
@@ -16,7 +16,7 @@ limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
  android:installLocation="auto"
-  android:versionCode="65"
+  android:versionCode="66"
  android:versionName="2.0.4"
  package="com.google.android.maps.mytracks" >
  <!-- Permission to initialize services -->