Merge heads

This commit is contained in:
youtaol
2013-07-10 14:19:41 +08:00
parent fd3940fcd0
commit 4debca0054
220 changed files with 359 additions and 293 deletions
+2 -2
View File
@@ -138,7 +138,7 @@ limitations under the License.
android:allowBackup="true"
android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent"
android:hardwareAccelerated="true"
android:icon="@drawable/my_tracks_icon"
android:icon="@drawable/ic_launcher_my_tracks"
android:label="@string/my_tracks_app_name"
android:theme="@style/MyTracks" >
<!-- For data backup -->
@@ -252,7 +252,7 @@ limitations under the License.
<service
android:enabled="true"
android:exported="true"
android:icon="@drawable/arrow_320"
android:icon="@drawable/ic_arrow_320"
android:label="@string/my_tracks_recording_service"
android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
android:permission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />