tree d7820b05cab5092ec1f1e77b6d6ee3b335432cfb
parent 85ed27f01831f7d39cfc4cfa0500b5bcd77b5158
parent 582d7468612766cf7b3653f4ad29580307a8686a
author Eino-Ville Talvala <etalvala@google.com> 1346957217 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346957217 -0700

am 582d7468: am 96150cfc: Camera2: Move locked states out of AE/AWB mode

* commit '582d7468612766cf7b3653f4ad29580307a8686a':
  Camera2: Move locked states out of AE/AWB mode