OSDN Git Service

am 3fd6b2b9: am 3a1c6dac: Merge "Add XML files for new camera2 hardware features...
authorYin-Chia Yeh <yinchiayeh@google.com>
Sat, 15 Nov 2014 16:00:58 +0000 (16:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 15 Nov 2014 16:00:58 +0000 (16:00 +0000)
* commit '3fd6b2b912037a7cca8d2591dfa8f9a83d0e46e7':
  Add XML files for new camera2 hardware features


Trivial merge