Merge heads

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="64"
+  android:versionCode="65"
   android:versionName="2.0.4"
   package="com.google.android.maps.mytracks" >
   <!-- Permission to initialize services -->

MyTracks/res/values/strings.xml

@@ -19,7 +19,7 @@ limitations under the License.
   <!-- About -->
   <string name="about_copyright_notice"
     translation_description="In the 'About My Tracks' page, the copyright notice.">
-    Copyright 2009 Google Inc.
+    Copyright 2013 Google Inc.
   </string>
   <string name="about_license"
     translation_description="In the 'About My Tracks' page, the button on the bottom to open the
@@ -588,7 +588,7 @@ limitations under the License.
   <string name="eula_copyright_year"
     translation_description="The copyright year in the 'Terms of Service'. See
       http://m.google.com/toscountry. \u00A9 is the unicode value for the copyright symbol.">
-    \u00A92012
+    \u00A92013
   </string>
   <string name="eula_date"
     translation_description="The date in the 'Terms of Service'. See

MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java

@@ -385,9 +385,9 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
     listView.setOnItemClickListener(new OnItemClickListener() {
         @Override
       public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        Intent intent = IntentUtils.newIntent(TrackListActivity.this, TrackDetailActivity.class)
+        Intent newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackDetailActivity.class)
             .putExtra(TrackDetailActivity.EXTRA_TRACK_ID, id);
-        startActivity(intent);
+        startActivity(newIntent);
       }
     });
     sectionResourceCursorAdapter = new SectionResourceCursorAdapter(

MyTracksLib/AndroidManifest.xml

@@ -26,7 +26,7 @@ limitations under the License.
   -->
   <uses-sdk
     android:minSdkVersion="8"
-    android:targetSdkVersion="16" />
+    android:targetSdkVersion="17" />
 
   <application
     android:icon="@drawable/my_tracks_icon"