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)
commit6ae9c59b0c0e969e51bad3a7827c69dad0f91cb5
tree1e5c8c86dc8bbe2e0c085c4bab5865436f839c55
parent9ac0a76bb7fb30ef54b71af4b07036136772af8f
parent84834094210a0664b644dea8ef4bd9fcce2908eb
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
am: 8483409421

Change-Id: I5446a96e0aab856aed2d42e950fc00d7abc03e60