OSDN Git Service

Merge \"Camera2: Add @hide variant for openCamera for UID forwarding\" into nyc-mr1-dev
authorEino-Ville Talvala <etalvala@google.com>
Fri, 8 Jul 2016 21:15:20 +0000 (21:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Jul 2016 21:15:20 +0000 (21:15 +0000)
am: 8c22370331

Change-Id: Ie03815d4793fd432f8e49d2119d2a9478bdd4332


Trivial merge