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:48 +0000 (20:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 20 Aug 2014 20:56:48 +0000 (20:56 +0000)
* commit '2440815caec484357250ddf0442e7cde2f4241ca':
  Add zoom to CaptureModule and OneCamera.


Trivial merge