merge heads

This commit is contained in:
Jimmy Shih
2012-03-20 13:31:47 -07:00
parent 21ba44d422
commit 6e413f41b3
4 changed files with 35 additions and 36 deletions
+1 -1
View File
@@ -159,7 +159,7 @@ limitations under the License.
android:name="android.app.default_searchable"
android:value="com.google.android.apps.mytracks.SearchActivity" />
</activity>
<activity android:name="com.google.android.apps.mytracks.ExportAllActivity"/>
<activity android:name="com.google.android.apps.mytracks.ExportActivity"/>
<activity
android:label="@string/my_tracks_importer"
android:name="com.google.android.apps.mytracks.ImportActivity"