From: ztenghui <ztenghui@google.com>
Date: Thu, 10 Oct 2013 16:18:22 +0000 (-0700)
Subject: am d6f2c5c0: am 8d2bc8ef: am d46d6f8e: Merge "Fix flash issue" into gb-ub-photos... 
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~159^2~141
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=aebc34684139e4cb0bb819ef1eb3d97ed644a89e;p=android-x86%2Fpackages-apps-Camera2.git

am d6f2c5c0: am 8d2bc8ef: am d46d6f8e: Merge "Fix flash issue" into gb-ub-photos-carlsbad

* commit 'd6f2c5c0cacbe54d8daef9b6d75b30a95985996c':
  Fix flash issue
---

aebc34684139e4cb0bb819ef1eb3d97ed644a89e