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:31:25 +0000 (23:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 23:31:25 +0000 (23:31 +0000)
commit4f735598fc0e570631219b94b944167eae032f55
treed3409b8d78ded11c98c9e4ea9baffbffabbd4f30
parent4d3a0ca1f99ce798a4d478d45d14a0d5f6a6ddb8
parent2a1c3d976d02ef078915bbb11814bb459fe57768
Merge "Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89 am: d5cc64f349" into oc-dr1-dev-plus-aosp am: 8e00d3f2bf
am: 2a1c3d976d

Change-Id: I6dbc6475e36beb65b865e18e31f79177c8608cda