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)
commitbece80ee4d7a2e2a2535dc54ebefd44257952bfd
tree17619fb78270fa9d51d6f3f3886e7b840341fa7a
parent8dff77a3ac043923148c7c7f00e98ebcb84493eb
parent334e733ea2f53d020e77e5cead189a529d7ee61f
Merge "Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89 am: 615f9e1277" into oc-mr1-dev
am: 334e733ea2

Change-Id: I30a14e0e9677158082cf83a04328697c50c5587d