tree ec2dc2604ec5fc6201ad181f4d008873e02ad881
parent 8df82a9379f1c29f0ece3ef2cad388781c7352bf
parent c26b490d5de47f6bc2970e9ba85dc3ef6d914463
author Yin-Chia Yeh <yinchiayeh@google.com> 1429202759 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429202759 +0000

am c26b490d: Merge "DO NOT MERGE: Camera: disable AE/AWB lock test on legacy devices" into lmp-mr1-dev

* commit 'c26b490d5de47f6bc2970e9ba85dc3ef6d914463':
  DO NOT MERGE: Camera: disable AE/AWB lock test on legacy devices