diff options
author | ztenghui <ztenghui@google.com> | 2013-10-11 17:41:31 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-11 17:41:31 -0700 |
commit | 25d6a81eaa4260e792381f4eb035ea1d4674b81c (patch) | |
tree | b4f3ca5007a70b8f4fddc45d1c7ecc796b90199b /res/values-es-rUS | |
parent | 3a6c47dddab9f76493cedfadcf2393f006112525 (diff) | |
parent | 275625342769eba3e2b461e249aec83165e4e7f1 (diff) | |
download | android_packages_apps_Snap-25d6a81eaa4260e792381f4eb035ea1d4674b81c.tar.gz android_packages_apps_Snap-25d6a81eaa4260e792381f4eb035ea1d4674b81c.tar.bz2 android_packages_apps_Snap-25d6a81eaa4260e792381f4eb035ea1d4674b81c.zip |
am 27562534: Merge "Finish the secure camera activity when user try to play a video." into gb-ub-photos-carlsbad
* commit '275625342769eba3e2b461e249aec83165e4e7f1':
Finish the secure camera activity when user try to play a video.
Diffstat (limited to 'res/values-es-rUS')
0 files changed, 0 insertions, 0 deletions