merge heads

2011-10-28 13:01:29 -07:00
parent 2bacc8d7b8 c0a6850eff
commit 1637d2202c
53 changed files with 891 additions and 625 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>