Merge "Ignore orientation change to preserve ApnEditor." into nyc-mr2-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9b3b013..2ec976d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1937,6 +1937,7 @@
android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
<activity android:name="Settings$ApnEditorActivity"
+ android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/apn_edit">
<intent-filter>
<action android:name="android.intent.action.VIEW" />