tree 1f1776783eb72604cdffe5eb1728de132433fa67
parent 40be070922721b285a9436ec49e5d438ba322133
parent e44e90c82d75b806e89f751a61dc7e54d0144338
author Eino-Ville Talvala <etalvala@google.com> 1347646803 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347646803 -0700

am e44e90c8: Merge "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme."" into jb-mr1-dev

* commit 'e44e90c82d75b806e89f751a61dc7e54d0144338':
  Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme."