tree dfe12879ee1c48aef860344925f459af8e1b2038
parent ebf0e057d69259128a282e7c333b038b129a15f0
parent 8318c7862f2edca41a0e1d10d2e45af026e6089f
author Eino-Ville Talvala <etalvala@google.com> 1380137681 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380137681 -0700

am 8318c786: am 2b890936: Merge "Camera2/3: Support new PASSIVE_UNFOCUSED AF state" into klp-dev

* commit '8318c7862f2edca41a0e1d10d2e45af026e6089f':
  Camera2/3: Support new PASSIVE_UNFOCUSED AF state