| commit | cc258c5dc5e0a41dd428f9cf337e2ef7097e9446 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Thu Jun 09 17:43:28 2011 -0700 |
| committer | The Android Automerger <android-build@android.com> | Thu Jun 09 17:43:28 2011 -0700 |
| tree | 099b10a495ade7b113d8c6acb7ec2315d23588af | |
| parent | fdb4e69fad1c2566553cda66787b54c1de51924f [diff] | |
| parent | f5ed39cd40956a03c42a1bc2a10c2d3ff36ac889 [diff] |
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
diff --git a/res/values-large/styles.xml b/res/values-large/styles.xml index 266a01e..858a63a 100644 --- a/res/values-large/styles.xml +++ b/res/values-large/styles.xml
@@ -18,7 +18,7 @@ --> <resources> - <style name="Theme.WallpaperPicker" parent="android:Theme.Holo.Dialog.NoFrame"> + <style name="Theme.WallpaperPicker" parent="@*android:Theme.Holo.Dialog.NoFrame"> </style> <style name="Theme" parent="android:Theme.Holo">