merge heads

2011-12-09 13:53:16 -08:00
parent ca889ee04c
commit 456fa03f8e
82 changed files with 14596 additions and 2620 deletions
@@ -17,8 +17,8 @@ limitations under the License.
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          package="com.google.android.maps.mytracks"
          android:installLocation="auto"
-          android:versionCode="34"
-          android:versionName="1.1.11">
+          android:versionCode="35"
+          android:versionName="1.1.12">
  <application android:icon="@drawable/arrow_icon"
               android:label="@string/my_tracks_app_name"
               android:name="com.google.android.apps.mytracks.MyTracksApplication"