commit 29294d8408c3a754ea118160d29931e5646a5e1a
author Amith Yamasani <yamasani@google.com> Fri Jun 07 14:55:09 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 07 14:55:09 2013 -0700
tree 6ff8a78f0f1d63196ffd9cd488ed9a660976f64d
parent e84b20ba2ff70fd4eff8d213dc9f89f1f57f15c1
parent f3e827e83da8d6aa70850c85bbe87d2f9feb82b1

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

* commit 'f3e827e83da8d6aa70850c85bbe87d2f9feb82b1':
  Don't show ApnEditor as a dialog

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 91ed343..7025a9c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1043,8 +1043,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" />