commit 03a9fb6723f2f6692abab83a75ce5a1e8ca63017
author Amith Yamasani <yamasani@google.com> Fri Jun 07 14:57:38 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 07 14:57:38 2013 -0700
tree 342a63f03b8af9f9f201a63d1766a0784d6783ef
parent 45d7fd85a24725f8ea244af213772ecf2d0b97db
parent 29294d8408c3a754ea118160d29931e5646a5e1a

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

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cf9739c..39279d4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1041,8 +1041,7 @@
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"/>
 
         <activity android:name="ApnEditor"
-                android:label="@string/apn_edit"
-                android:theme="@android:style/Theme.Holo.DialogWhenLarge">
+                android:label="@string/apn_edit">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.EDIT" />