tree 90aee0152afd9c118231ce7e472c53d8fdaca2fa
parent 379f0544e51653ba8b45da4d67dba8cc726fb093
parent 46d5f09474f3247bbd914627d4f4b02219233421
author Yin-Chia Yeh <yinchiayeh@google.com> 1416340109 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416340109 +0000

am 46d5f094: Merge "CameraITS: allow more time for AE converge" into lmp-sprout-dev

* commit '46d5f09474f3247bbd914627d4f4b02219233421':
  CameraITS: allow more time for AE converge