OSDN Git Service

Merge "Camera: Add XML entries and files for new system features" into lmp-mr1-dev
authorEino-Ville Talvala <etalvala@google.com>
Sat, 22 Nov 2014 04:57:51 +0000 (04:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 22 Nov 2014 04:57:51 +0000 (04:57 +0000)

Trivial merge