OSDN Git Service

am 2440815c: Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier
authorAndy Huibers <andyhuibers@google.com>
Wed, 20 Aug 2014 20:56:39 +0000 (20:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 20 Aug 2014 20:56:39 +0000 (20:56 +0000)
commit0b832c3f870d0df792c64eebe46b14ff082e60d4
tree797ce9bd222a81f71d0967f8fe9a139c75dfdc34
parentc4ad932aa0616e9ddd4faa5cec2e10987bc29755
parent2440815caec484357250ddf0442e7cde2f4241ca
am 2440815c: Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier

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