diff options
author | Sascha Häberling <haeberling@google.com> | 2014-09-06 02:58:11 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-06 02:58:11 +0000 |
commit | dc563a3713e1cd6c4cc2c1681cac081b753e161b (patch) | |
tree | a5892f3a41c00943d3c94ea74cfbc7188ae9235b | |
parent | 4a9de272c251432c100986f8167618d101e5a522 (diff) | |
parent | 13d07d0ecb3bc808fb6f5b65508b1948ab3149d8 (diff) | |
download | android_packages_apps_Camera2-dc563a3713e1cd6c4cc2c1681cac081b753e161b.tar.gz android_packages_apps_Camera2-dc563a3713e1cd6c4cc2c1681cac081b753e161b.tar.bz2 android_packages_apps_Camera2-dc563a3713e1cd6c4cc2c1681cac081b753e161b.zip |
am 13d07d0e: (-s ours) DO NOT MERGE Pipe context through to camera
* commit '13d07d0ecb3bc808fb6f5b65508b1948ab3149d8':
DO NOT MERGE Pipe context through to camera
0 files changed, 0 insertions, 0 deletions