From: Eino-Ville Talvala <etalvala@google.com>
Date: Mon, 24 Nov 2014 18:05:35 +0000 (+0000)
Subject: am 9c08f6c8: Merge "Camera: Add XML entries and files for new system features" into... 
X-Git-Tag: android-x86-6.0-r1~75^2~136
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6086365e41e0e1656e8bfffdf4b70f897f080994;p=android-x86%2Fframeworks-native.git

am 9c08f6c8: Merge "Camera: Add XML entries and files for new system features" into lmp-mr1-dev

* commit '9c08f6c8364ce82c3855ad8c6ee98cb2c6595141':
  Camera: Add XML entries and files for new system features
---

6086365e41e0e1656e8bfffdf4b70f897f080994