From: Eino-Ville Talvala <etalvala@google.com>
Date: Mon, 24 Sep 2012 16:26:15 +0000 (-0700)
Subject: am df2bc296: Merge "Camera2: Don\'t use ZSL when flash is on force fire mode." into... 
X-Git-Tag: android-x86-4.4-r1~23^2~80^2~186
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9be73d34242fe83df0a32c5887f6e5eef623a0ad;p=android-x86%2Fframeworks-av.git

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

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

9be73d34242fe83df0a32c5887f6e5eef623a0ad