tree bebf82ab785ef323682eaf52424718d08c094130
parent ca3fb120f5697c05e3ea1a50abe913a9cc4a8d73
parent 059161b7ab0a38b276b1aa26e73ff4398a02e012
author Ed Heyl <edheyl@google.com> 1369372523 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1369372523 +0000

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