summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2011-05-21 21:34:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-21 21:34:56 -0700
commit736c987340d2e3d12f7b177be3692abf4abeebb6 (patch)
tree2a42bf176955abbd78af472e94b5ebaeb6df38c4 /packages
parentf746fc9e45c2bc80d8af2eb10d849c5807ebe1c7 (diff)
parent7d75e772cbfe3f28451981f3e6b4d10f6a5ddc05 (diff)
downloadframeworks_base-736c987340d2e3d12f7b177be3692abf4abeebb6.zip
frameworks_base-736c987340d2e3d12f7b177be3692abf4abeebb6.tar.gz
frameworks_base-736c987340d2e3d12f7b177be3692abf4abeebb6.tar.bz2
am 7d75e772: am ef2b2669: am 5e731140: Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2
* commit '7d75e772cbfe3f28451981f3e6b4d10f6a5ddc05': Fix 4462474: Fixes crash on 7" tablet due to using wrong resource
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/res/values-large/styles.xml (renamed from packages/SystemUI/res/values-xlarge/styles.xml)0
1 files changed, 0 insertions, 0 deletions
diff --git a/packages/SystemUI/res/values-xlarge/styles.xml b/packages/SystemUI/res/values-large/styles.xml
index 12c8950..12c8950 100644
--- a/packages/SystemUI/res/values-xlarge/styles.xml
+++ b/packages/SystemUI/res/values-large/styles.xml