OSDN Git Service

Merge "Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89 am:...
authorChien-Yu Chen <cychen@google.com>
Wed, 2 Aug 2017 23:45:42 +0000 (23:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 23:45:42 +0000 (23:45 +0000)
am: 334e733ea2

Change-Id: I30a14e0e9677158082cf83a04328697c50c5587d


Trivial merge