tree 839804631f4f1a60ff776a67885a66d40b579650
parent e4c7ec847d83edfb54c215f3ab6093efeb17a586
parent e86d1091766b012da1f6616c7ec270d332baef95
author Eino-Ville Talvala <etalvala@google.com> 1416632271 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1416632271 +0000

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