Merge to head

2011-12-06 16:34:48 -02:00
parent bb3a14aac0
commit ebe8cbc798
94 changed files with 2793 additions and 1892 deletions
@@ -168,6 +168,7 @@ limitations under the License.
    </activity>

    <activity android:name="com.google.android.apps.mytracks.io.file.ImportActivity"
+              android:label="@string/my_tracks_importer"
              android:theme="@android:style/Theme.Translucent.NoTitleBar"
              android:noHistory="true">
      <intent-filter>