Merge to head

This commit is contained in:
Rodrigo Damazio
2012-01-28 00:00:48 -02:00
parent 11972297b0
commit 22e9687aff
24 changed files with 1353 additions and 2459 deletions
+1
View File
@@ -285,6 +285,7 @@ limitations under the License.
<activity android:name="com.google.android.apps.mytracks.io.docs.SendDocsActivity"/>
<activity android:name="com.google.android.apps.mytracks.io.maps.ChooseMapActivity"
android:label="@string/maps_list_title"/>
<activity android:name="com.google.android.apps.mytracks.io.maps.SendMapsActivity"/>
<activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.AccountChooserActivity"/>
<activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.SendFusionTablesActivity"/>
<activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadResultActivity"/>