am 29294d84: am f3e827e8: Merge "Don\'t show ApnEditor as a dialog" into jb-mr2-dev

* commit '29294d8408c3a754ea118160d29931e5646a5e1a':
  Don't show ApnEditor as a dialog
This commit is contained in:
Amith Yamasani
2013-06-07 14:57:38 -07:00
committed by Android Git Automerger

View File

@@ -1041,8 +1041,7 @@
android:theme="@android:style/Theme.Holo.DialogWhenLarge"/> android:theme="@android:style/Theme.Holo.DialogWhenLarge"/>
<activity android:name="ApnEditor" <activity android:name="ApnEditor"
android:label="@string/apn_edit" android:label="@string/apn_edit">
android:theme="@android:style/Theme.Holo.DialogWhenLarge">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<action android:name="android.intent.action.EDIT" /> <action android:name="android.intent.action.EDIT" />