tree 29d58600eefaa7f67d1bdcc989e4e2c3f82216f9
parent 034f561dd843afbe148477889e6acf71333fcc8a
parent b7ad9e4ac0ec896f6df5c771ed648bea6919a688
author Eino-Ville Talvala <etalvala@google.com> 1347489343 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347489343 -0700

am 8bb57472: am 2552036a: Merge "Camera2: Configure ZSL at the right time." into jb-mr1-dev

* commit '8bb574725ea880c53986c8d66eeb090731ecd6d5':
  Camera2: Configure ZSL at the right time.