tree 6388298979f2e3c7408ba95ce6df4abed87ce0b4
parent b1ec20d95cf84f0919abee96c3e39f9f0e999e6e
parent fb2d29b0bac08d3aa31d53bfbeec73d62acac5a3
author Yin-Chia Yeh <yinchiayeh@google.com> 1429203445 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429203445 +0000

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

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