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 22:54:40 +0000 (22:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 22:54:40 +0000 (22:54 +0000)
commit2a1c3d976d02ef078915bbb11814bb459fe57768
tree3cb83b19fa8a63fd2d811984986a413f6413456f
parent3dd904da894f358b368b983c9718845bad1cd98b
parent8e00d3f2bff73310a0f702fed793eba0921dc5c1
Merge "Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89 am: d5cc64f349" into oc-dr1-dev-plus-aosp
am: 8e00d3f2bf

Change-Id: I4901d05222f9641b1d5ebcff4af37e7175de35db