merge heads

2012-04-02 14:49:12 -07:00
parent 0bd4461c32
commit 2d05ff98ca
75 changed files with 783 additions and 794 deletions
@@ -137,8 +137,7 @@ limitations under the License.
    android:icon="@drawable/arrow_icon"
    android:label="@string/my_tracks_app_name"
    android:name="com.google.android.apps.mytracks.MyTracksApplication"
-    android:theme="@style/ThemeSelector"
-    android:uiOptions="splitActionBarWhenNarrow" >
+    android:theme="@style/ThemeSelector" >

    <!-- For data backup -->
    <meta-data