| commit | 334e733ea2f53d020e77e5cead189a529d7ee61f | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Aug 02 22:59:25 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 02 22:59:25 2017 +0000 |
| tree | 8440fabe5a84c451eb7d8a5fe60d786842157694 | |
| parent | 988a6dd5e312ace695ae4f67732f96d69fc29f32 [diff] | |
| parent | cd1cb8331442cc6e41a94c964886859a6567a108 [diff] |
Merge "Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89 am: 615f9e1277" into oc-mr1-dev