From 621a33a5169f0fa6af0343342f86d072b5c6a8b6 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Sat, 2 Jun 2012 14:25:05 -0700
Subject: [PATCH] merge heads

---
 MyTracks/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index fbf179b96..0763730ee 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -16,7 +16,7 @@ limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   android:installLocation="auto"
-  android:versionCode="41"
+  android:versionCode="42"
   android:versionName="2.0"
   package="com.google.android.maps.mytracks" >