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 | 06fe6accb6abb284b77acd66e8db98421024b99b (patch) | |
| tree | f7744b79a62b9a554749a00e60ba60e538fa883a /res/values | |
| parent | 6f4e0db3406c54feb479bb828fdb054333d1af27 (diff) | |
| parent | f8602430548c07a35b91f16b134bb0fcc007cbbe (diff) | |
| download | android_packages_apps_Snap-06fe6accb6abb284b77acd66e8db98421024b99b.tar.gz android_packages_apps_Snap-06fe6accb6abb284b77acd66e8db98421024b99b.tar.bz2 android_packages_apps_Snap-06fe6accb6abb284b77acd66e8db98421024b99b.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" /> |