tree 530aa9fd4b8e26b747adf7d6ebdc503534767379
parent 62dbe93f7743061e97fc3299386a2f887ca748cf
parent 369af71eb7e402ee68b66b0f0ede5d4d40c857d1
author Zhijun He <zhijunhe@google.com> 1380153679 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380153679 -0700

am 369af71e: am 6914de6d: Merge "Camera: Implement getCameraCharacteristics" into klp-dev

* commit '369af71eb7e402ee68b66b0f0ede5d4d40c857d1':
  Camera: Implement getCameraCharacteristics