am 42f178d1: resolved conflicts for merge of 70a1ff03 to honeycomb-plus-aosp

* commit '42f178d10bcad0a8c04f20b2dfd2e3c28117a7cf':
  Settings: Improved UX when viewing open source license info.
This commit is contained in:
Kenny Root
2011-03-30 16:38:52 -07:00
committed by Android Git Automerger
2 changed files with 152 additions and 54 deletions

View File

@@ -485,7 +485,8 @@
<activity android:name="SettingsLicenseActivity"
android:label="@string/settings_license_activity_title"
android:theme="@*android:style/Theme.Holo.Dialog.Alert">
android:theme="@*android:style/Theme.Holo.Dialog.Alert"
android:configChanges="orientation">
<intent-filter>
<action android:name="android.settings.LICENSE" />
<category android:name="android.intent.category.DEFAULT" />