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 | 854a6be70f34ca314e839580cc09ff1efa353a3b (patch) | |
tree | 4c9179a9780aed29ddef284dc75f0108f61c9cb7 /res/values-uk | |
parent | 6d01890aebe277cba6e9bf095c153ea27092cf60 (diff) | |
parent | 275625342769eba3e2b461e249aec83165e4e7f1 (diff) | |
download | android_packages_apps_Camera2-854a6be70f34ca314e839580cc09ff1efa353a3b.tar.gz android_packages_apps_Camera2-854a6be70f34ca314e839580cc09ff1efa353a3b.tar.bz2 android_packages_apps_Camera2-854a6be70f34ca314e839580cc09ff1efa353a3b.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-uk')
0 files changed, 0 insertions, 0 deletions