diff options
| author | George Mount <mount@google.com> | 2013-04-18 21:20:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-18 21:20:31 +0000 |
| commit | b726c83ab60b0ec8e93cad9724857999b3bb8ec5 (patch) | |
| tree | 6eb8acabfa3eabcb7d30a7417ac866ed449460c5 /res/values | |
| parent | c3178ca4daf7ed570f3432f3433959c208ecc105 (diff) | |
| parent | f453f1cc2e2c93b4357e3b0fb140f6cd3c119440 (diff) | |
| download | android_packages_apps_Gallery2-b726c83ab60b0ec8e93cad9724857999b3bb8ec5.tar.gz android_packages_apps_Gallery2-b726c83ab60b0ec8e93cad9724857999b3bb8ec5.tar.bz2 android_packages_apps_Gallery2-b726c83ab60b0ec8e93cad9724857999b3bb8ec5.zip | |
Merge "Change labels so that it doesn't clash with PanoUiLib." into gb-ub-photos-bryce
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/attrs.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index cd849b62a..582ddcb4e 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -32,7 +32,7 @@ <attr name="defaultValue" format="string|reference" /> <attr name="entryValues" format="reference" /> <attr name="entries" format="reference" /> - <attr name="labels" format="reference" /> + <attr name="labelList" format="reference" /> </declare-styleable> <declare-styleable name="IconIndicator"> <attr name="icons" format="reference" /> |