commit | 8e00d3f2bff73310a0f702fed793eba0921dc5c1 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Aug 02 20:07:11 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 02 20:07:11 2017 +0000 |
tree | e94405b271f62d746cbcb581a924773cd4690f50 | |
parent | 5a7aefdb3da2ffcaaa24bcaa4ba6b4f1ed75eb3e [diff] | |
parent | 9b5c34b34f73987f141a497c814cf7ca170bf6da [diff] |
Merge "Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89 am: d5cc64f349" into oc-dr1-dev-plus-aosp