OSDN Git Service

Merge "Merge "Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Wed, 2 Aug 2017 23:48:28 +0000 (23:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 2 Aug 2017 23:48:28 +0000 (23:48 +0000)
commit84834094210a0664b644dea8ef4bd9fcce2908eb
tree70e80631054132dbae79ebfce39c8f1dfe216a01
parentfaf9590064850a9cf0a26fbe2eaa80378ec3ada4
parentbece80ee4d7a2e2a2535dc54ebefd44257952bfd
Merge "Merge "Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89 am: 615f9e1277" into oc-mr1-dev am: 334e733ea2" into oc-mr1-dev-plus-aosp