tree 4251aaeeef74924a64f74434026aa504bbf47270
parent 5ff6057bd32737c808f978eae6c100ffa24148d1
parent cb6eae0e2eda2a9383ba2682b739b3616a9eaefc
author Yin-Chia Yeh <yinchiayeh@google.com> 1415991997 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415991997 +0000

am cb6eae0e: Merge "Camera: doc update for independent 3A" into lmp-mr1-dev

* commit 'cb6eae0e2eda2a9383ba2682b739b3616a9eaefc':
  Camera: doc update for independent 3A