From: Igor Murashkin <iam@google.com>
Date: Thu, 2 May 2013 23:05:48 +0000 (-0700)
Subject: am 2628bc9d: Merge "camera3: Don\'t crash when taking a still capture with ZSL disabl... 
X-Git-Tag: android-x86-4.4-r1~416^2~15
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f9539bb75101b85033eb45fd283b3fa40eaa8c98;p=android-x86%2Fframeworks-av.git

am 2628bc9d: Merge "camera3: Don\'t crash when taking a still capture with ZSL disabled" into jb-mr2-dev

* commit '2628bc9d1261c2942f3506baca348ccd71ea9c86':
  camera3: Don't crash when taking a still capture with ZSL disabled
---

f9539bb75101b85033eb45fd283b3fa40eaa8c98