am 4abe488a: Merge "No back icon in action bar of APN Settings"

* commit '4abe488a5f18d04513b294dce1f7f63d0c9cf3a0':
  No back icon in action bar of APN Settings

diff --cc AndroidManifest.xml
index c41c40c,47f7c6b..91ed343
--- 1/AndroidManifest.xml
--- 2/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -261,8 -254,10 +261,9 @@@
  
          <activity android:name="ApnSettings"
                  android:label="@string/apn_settings"
 -                android:uiOptions="none"
                  android:configChanges="orientation|keyboardHidden|screenSize"
-                 android:launchMode="singleTask">
+                 android:launchMode="singleTask"
+                 android:parentActivityName="Settings$WirelessSettingsActivity">
              <intent-filter>
                  <action android:name="android.intent.action.MAIN" />
                  <action android:name="android.settings.APN_SETTINGS" />