Merge "Fix crash issue when user uses multi-window mode on VoicemailSettings"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7c47c17..0afb739 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -554,7 +554,7 @@
<activity android:name="com.android.phone.settings.VoicemailSettingsActivity"
android:label="@string/voicemail"
- android:configChanges="orientation|screenSize|keyboardHidden"
+ android:configChanges="orientation|screenSize|keyboardHidden|screenLayout"
android:theme="@style/DialerSettingsLight">
<intent-filter >
<!-- DO NOT RENAME. There are existing apps which use this string. -->