tree 92d9b5a29057b3c4b2ea988c4bfc97f37c926509
parent 10665f4b0c5dc94ce7cceaa1fd60a8c29b384114
parent 68ade37943149890a02d4b12d71c633ae785b177
author Igor Murashkin <iam@google.com> 1357853671 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1357853671 -0800

Merge changes I36c3dcaa,I7574913a,I8db9d918,I37e2c005 into jb-mr1-aah-dev

* changes:
  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