Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 70a1ff03 to honeycomb-plus-aosp

Browse Source 
Change-Id: I1df4d790b070acbf89b9ee16bd750918486fce58
This commit is contained in:
Kenny Root
2011-03-30 09:36:19 -07:00
parent f701fd1a96 70a1ff0357
commit 42f178d10b
2 changed files with 152 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AndroidManifest.xml
View File

@@ -479,7 +479,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" />