commit | acbf9e7e14757223a5c4eb289641f6f9d458cfa6 | [log] [tgz] |
---|---|---|
author | Igor Murashkin <iam@google.com> | Fri Jan 11 10:54:00 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 11 10:54:00 2013 -0800 |
tree | 477c17ad5b3ce4d9f09fcf26fdb60c7a52f58cbc | |
parent | b4b8879da3c6a7daf0f2a58bbd2d4d4169f33a31 [diff] | |
parent | caf8379a8d64d69cc9756cee5c3ab310e1ab258d [diff] |
am caf8379a: am ba48d6f0: Merge changes I36c3dcaa,I7574913a,I8db9d918,I37e2c005 into jb-mr1-aah-dev * commit 'caf8379a8d64d69cc9756cee5c3ab310e1ab258d': Camera2: Fix segfault when control fields were omitted in metadata: DO NOT MERGE Camera2: Test: fix deadlock in isStreamInUse: DO NOT MERGE Camera2: Return -ENODEV for camera indices out of bounds: DO NOT MERGE Camera2: Turn off 3A when android.control.mode == OFF: DO NOT MERGE