| commit | 8660a7583fa555a48d84fe8632da9e8cee92cc66 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Thu Apr 27 13:07:04 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 27 13:07:04 2017 +0000 |
| tree | d85646c311312606e2d783fec22c9a868d09fa04 | |
| parent | 71419a14131dc298a1580213dbdec30253bcf171 [diff] | |
| parent | be014da6387246edd786a4ec9ca049d3accdcd12 [diff] |
resolve merge conflicts of 01f050f21fb2 to oc-dev-plus-aosp am: be014da638 Change-Id: I5343d48d7bd21128c570feb1c4a534826dbdce10