diff options
author | Sascha Haeberling <haeberling@google.com> | 2015-05-15 17:35:14 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-15 17:35:14 +0000 |
commit | 21492344962a2e0ae096ccc17555a5e707a474e6 (patch) | |
tree | 7ca3de43edfefe35465d55c7ab45604f4d8ea68b | |
parent | a5a9be671fea539219bb45bdc62cb71906003325 (diff) | |
parent | 8daec257bfe3575d008189df0a945a1ba2238cfa (diff) | |
download | android_packages_apps_Camera2-21492344962a2e0ae096ccc17555a5e707a474e6.tar.gz android_packages_apps_Camera2-21492344962a2e0ae096ccc17555a5e707a474e6.tar.bz2 android_packages_apps_Camera2-21492344962a2e0ae096ccc17555a5e707a474e6.zip |
am 8daec257: am 969d606a: Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier
* commit '8daec257bfe3575d008189df0a945a1ba2238cfa':
0 files changed, 0 insertions, 0 deletions