OSDN Git Service

am 6914de6d: Merge "Camera: Implement getCameraCharacteristics" into klp-dev
authorZhijun He <zhijunhe@google.com>
Wed, 25 Sep 2013 23:56:08 +0000 (16:56 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Sep 2013 23:56:08 +0000 (16:56 -0700)
* commit '6914de6dd1d74fcf74e3247c89f9293fbf7bafe5':
  Camera: Implement getCameraCharacteristics


Trivial merge