OSDN Git Service

Merge "Merge "Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89...
authorChien-Yu Chen <cychen@google.com>
Thu, 3 Aug 2017 01:12:11 +0000 (01:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 01:12:11 +0000 (01:12 +0000)
am: 8483409421

Change-Id: I5446a96e0aab856aed2d42e950fc00d7abc03e60


Trivial merge