merge heads

2011-10-31 09:41:15 -07:00
parent c1d4dd92cd
commit 507ab6723c
26 changed files with 570 additions and 289 deletions
@@ -81,7 +81,6 @@ limitations under the License.
    </activity>

    <activity android:name="com.google.android.apps.mytracks.DeleteTrack"
-              android:label="@string/deletetrack_title"
              android:theme="@android:style/Theme.Translucent.NoTitleBar"
              android:noHistory="true">
      <intent-filter>
@@ -151,7 +150,6 @@ limitations under the License.
    </activity>

    <activity android:name="com.google.android.apps.mytracks.io.file.ImportActivity"
-              android:label="@string/import_title"
              android:theme="@android:style/Theme.Translucent.NoTitleBar"
              android:noHistory="true">
      <intent-filter>