merge heads

This commit is contained in:
Jimmy Shih
2012-03-20 10:37:14 -07:00
parent 08a17a58ef
commit b8400cc0bf
6 changed files with 321 additions and 236 deletions
+2 -1
View File
@@ -171,6 +171,7 @@ limitations under the License.
<data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
</intent-filter>
</activity>
<activity android:name="com.google.android.apps.mytracks.ExportAllActivity"/>
<activity
android:exported="false"
android:name="com.google.android.apps.mytracks.MapActivity" >
@@ -312,7 +313,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" />