tree e43fc3f64b5c775c8038794fdbdadc61ff32fc17
parent d41a238ada7ffe06e95c1971c066be94e58012cc
parent 9be73d34242fe83df0a32c5887f6e5eef623a0ad
author Eino-Ville Talvala <etalvala@google.com> 1348504582 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348504582 -0700

am 585549bc: am df2bc296: Merge "Camera2: Don\'t use ZSL when flash is on force fire mode." into jb-mr1-dev

* commit '585549bc13dc03859d39f92f13e9da5e583b2d28':
  Camera2: Don't use ZSL when flash is on force fire mode.