| commit | c4ca931dc558ef860f9c3a914d4ec4b933847e02 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Wed Oct 25 05:22:04 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 25 05:22:04 2017 +0000 |
| tree | 6006219312b8d85d73f1f68647bb0c7e22278660 | |
| parent | 51c2848c449a322afc3977f4918a84b40b0a734e [diff] | |
| parent | b88a71e60c904b0fe1b91e0b52ca99517c969a3b [diff] |
Merge "resolve merge conflicts of 1fae62661258 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp