merge heads

This commit is contained in:
Jimmy Shih
2012-03-20 11:04:54 -07:00
9 changed files with 580 additions and 256 deletions
+4 -1
View File
@@ -283,6 +283,9 @@ limitations under the License.
android:exported="false"
android:label="@string/welcome_title"
android:name="com.google.android.apps.mytracks.WelcomeActivity" />
<activity android:name="com.google.android.apps.mytracks.io.backup.BackupActivity"/>
<activity android:name="com.google.android.apps.mytracks.io.backup.RestoreActivity"/>
<activity android:name="com.google.android.apps.mytracks.io.backup.RestoreChooserActivity"/>
<activity android:name="com.google.android.apps.mytracks.io.docs.SendDocsActivity" />
<activity
android:name="com.google.android.apps.mytracks.io.file.SaveActivity"
@@ -302,7 +305,7 @@ limitations under the License.
<activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.AccountChooserActivity" />
<activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadResultActivity" />
<activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadServiceChooserActivity" />
<service
android:exported="false"
android:name="com.google.android.apps.mytracks.services.ControlRecordingService" />