OSDN Git Service

am 9c08f6c8: Merge "Camera: Add XML entries and files for new system features" into...
authorEino-Ville Talvala <etalvala@google.com>
Mon, 24 Nov 2014 18:05:35 +0000 (18:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Nov 2014 18:05:35 +0000 (18:05 +0000)
* commit '9c08f6c8364ce82c3855ad8c6ee98cb2c6595141':
  Camera: Add XML entries and files for new system features


Trivial merge