Merge heads

This commit is contained in:
youtaol
2012-05-15 16:58:38 +08:00
parent f1573a550a
commit 37bfefaa3d
29 changed files with 379 additions and 499 deletions
+2 -2
View File
@@ -16,8 +16,8 @@ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:installLocation="auto"
android:versionCode="39"
android:versionName="1.1.16"
android:versionCode="40"
android:versionName="2.0"
package="com.google.android.maps.mytracks" >
<!-- Permission to initialize services -->