OSDN Git Service

am df2bc296: Merge "Camera2: Don\'t use ZSL when flash is on force fire mode." into...
authorEino-Ville Talvala <etalvala@google.com>
Mon, 24 Sep 2012 16:26:15 +0000 (09:26 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Sep 2012 16:26:15 +0000 (09:26 -0700)
* commit 'df2bc29664d3bf80bed0012970608e5605acf7af':
  Camera2: Don't use ZSL when flash is on force fire mode.


Trivial merge