| commit | 7a4a517aeefedac443c3126ad4a5067ef2128c00 | [log] [tgz] |
|---|---|---|
| author | Zhuoyao Zhang <zhuoyao@google.com> | Wed Jul 26 19:38:22 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 26 19:38:22 2017 +0000 |
| tree | 161c6f46a280b176cb4e03f6787eccf7e05b4e50 | |
| parent | 8f2d92a5811e603e5a6de9e33f0cc3a8461dc0b4 [diff] | |
| parent | 1f888e8694c7ff07bbca7ab3c7eb5a92159798aa [diff] |
Merge "resolve merge conflicts of 8d92561 to oc-mr1-dev" into oc-mr1-dev