diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-10-13 16:07:48 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-13 16:07:48 -0700 |
commit | 23a2aa993c7997913f32cd5eb69e12d4f6e0e354 (patch) | |
tree | 0fbe08062089c3c305d4f1f8710e2e43ab791c33 /res/values | |
parent | 331201407e613e5a243b8cf6e8f3d5bdb647e6c5 (diff) | |
parent | 704530edd94ba9b5990a247d4156ec18bf6ea0eb (diff) | |
download | android_packages_apps_Snap-23a2aa993c7997913f32cd5eb69e12d4f6e0e354.tar.gz android_packages_apps_Snap-23a2aa993c7997913f32cd5eb69e12d4f6e0e354.tar.bz2 android_packages_apps_Snap-23a2aa993c7997913f32cd5eb69e12d4f6e0e354.zip |
am 704530ed: Merge "Add \'disabled\' state for when Gcam is unable to take another shot." into gb-ub-photos-carlsbad
* commit '704530edd94ba9b5990a247d4156ec18bf6ea0eb':
Add 'disabled' state for when Gcam is unable to take another shot.
Diffstat (limited to 'res/values')
0 files changed, 0 insertions, 0 deletions