| commit | 87041ff9a42e80e41365f98d67494530b7ef0b24 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 23 21:21:33 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 23 21:21:45 2017 +0000 |
| tree | ba2024ae79267264c783425464f306e1aef0fd77 | |
| parent | c3c7bdf043fe6d99698bd8ee8b957472495612f7 [diff] | |
| parent | 091ff6c0e07393e3449d2c032573ece2ea8fe146 [diff] |
Merge "resolve merge conflicts of 2e21f8d8cbbe to oc-dev-plus-aosp" into oc-dev-plus-aosp