tree 8701fcc8d41fceae8da02afd17b4bd6f408120d0
parent 9b89c15d9d8abb9408760ffdb022df4c4367685b
parent 6947f125f76dde6664779126415d11b3365225da
author Ed Heyl <edheyl@google.com> 1369372671 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369372671 -0700

am 6947f125: Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev

* commit '6947f125f76dde6664779126415d11b3365225da':
  camera3: Disable ZSL for limited mode camera HALs