From: Andy Huibers <andyhuibers@google.com>
Date: Wed, 20 Aug 2014 20:56:48 +0000 (+0000)
Subject: am 2440815c: Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~147
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f9f990b4;p=android-x86%2Fpackages-apps-Camera2.git

am 2440815c: Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier

* commit '2440815caec484357250ddf0442e7cde2f4241ca':
  Add zoom to CaptureModule and OneCamera.
---

f9f990b433a416952691d4a632237a4f6a530c4d