OSDN Git Service

am 369af71e: am 6914de6d: Merge "Camera: Implement getCameraCharacteristics" into...
authorZhijun He <zhijunhe@google.com>
Thu, 26 Sep 2013 00:01:19 +0000 (17:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 26 Sep 2013 00:01:19 +0000 (17:01 -0700)
* commit '369af71eb7e402ee68b66b0f0ede5d4d40c857d1':
  Camera: Implement getCameraCharacteristics


Trivial merge