am a697c62b: Merge "Stop using splitActionBar"

* commit 'a697c62b7d1e6d13c6e48f23af07e3b64f55dc3b':
  Stop using splitActionBar
This commit is contained in:
Tadashi G. Takaoka 2014-10-06 09:13:25 +00:00 committed by Android Git Automerger
commit fc08ae8c20

View file

@ -89,8 +89,7 @@
<activity android:name=".settings.SettingsActivity" <activity android:name=".settings.SettingsActivity"
android:theme="@style/platformSettingsTheme" android:theme="@style/platformSettingsTheme"
android:label="@string/english_ime_settings" android:label="@string/english_ime_settings">
android:uiOptions="splitActionBarWhenNarrow">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
</intent-filter> </intent-filter>