merge heads

This commit is contained in:
Jimmy Shih
2012-04-04 16:49:55 -07:00
parent aab0f63201
commit 1c0ce45937
13 changed files with 70 additions and 75 deletions
+3 -3
View File
@@ -192,7 +192,7 @@ limitations under the License.
</activity>
<activity
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale"
android:name="com.google.android.apps.mytracks.MyTracks" >
android:name="com.google.android.apps.mytracks.TrackDetailActivity" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -245,8 +245,8 @@ limitations under the License.
android:value="com.google.android.apps.mytracks.SearchActivity" />
</activity>
<activity
android:label="@string/track_detail_title"
android:name="com.google.android.apps.mytracks.TrackDetail" >
android:label="@string/track_edit_title"
android:name="com.google.android.apps.mytracks.TrackEditActivity" >
<intent-filter>
<action android:name="android.intent.action.EDIT" />