diff options
| author | George Mount <mount@google.com> | 2013-04-18 14:22:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-18 14:22:49 -0700 |
| commit | fc2d20d20ac00f6e9aba1f1b82e62ee30db1a00e (patch) | |
| tree | 4cb1f9c9f0070ad4b3ce0ca40248b252b633a319 /res/values | |
| parent | 00fc7327064900630c85e649888a82dfdd7e985e (diff) | |
| parent | 06fe6accb6abb284b77acd66e8db98421024b99b (diff) | |
| download | android_packages_apps_Snap-fc2d20d20ac00f6e9aba1f1b82e62ee30db1a00e.tar.gz android_packages_apps_Snap-fc2d20d20ac00f6e9aba1f1b82e62ee30db1a00e.tar.bz2 android_packages_apps_Snap-fc2d20d20ac00f6e9aba1f1b82e62ee30db1a00e.zip | |
am b726c83a: Merge "Change labels so that it doesn\'t clash with PanoUiLib." into gb-ub-photos-bryce
* commit 'b726c83ab60b0ec8e93cad9724857999b3bb8ec5':
Change labels so that it doesn't clash with PanoUiLib.
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" /> |