From: Yin-Chia Yeh <yinchiayeh@google.com>
Date: Sat, 15 Nov 2014 16:00:58 +0000 (+0000)
Subject: am 3fd6b2b9: am 3a1c6dac: Merge "Add XML files for new camera2 hardware features... 
X-Git-Tag: android-x86-6.0-r1~390
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=df6ca6a42ae06accd525d5b3d56039960b335a1e;p=android-x86%2Fframeworks-native.git

am 3fd6b2b9: am 3a1c6dac: Merge "Add XML files for new camera2 hardware features" into lmp-mr1-dev

* commit '3fd6b2b912037a7cca8d2591dfa8f9a83d0e46e7':
  Add XML files for new camera2 hardware features
---

df6ca6a42ae06accd525d5b3d56039960b335a1e