tree e2598ac19944819d244a464a3e7683840bec071c
parent 7d53ee95532f3105d2d2bf602c3ad20795ab81bc
parent fff97293d56ca9869004f89ce46c2b337d7f57e7
author Igor Murashkin <iam@google.com> 1347902924 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347902924 -0700

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

* commit 'fff97293d56ca9869004f89ce46c2b337d7f57e7':
  Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.