tree 88a1d28c5b413bf8e3780d02b3eb2c96508e8529
parent 8b622fe360e4c635fae9f8ecd8b2d88ef015af93
parent ba48d6f00c9a13ba00022949c87215ecf4b829aa
author Igor Murashkin <iam@google.com> 1357853736 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357853736 -0800

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

* commit 'ba48d6f00c9a13ba00022949c87215ecf4b829aa':
  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