| commit | bc8a5d022f6c3ee25d4b39ad546c145d7f3bbf94 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed May 22 00:38:28 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 22 00:38:28 2019 +0000 |
| tree | 386dcdd698c1f46ddc65133e06d2bff7f424d33c | |
| parent | db545b69dcfcf16a13a022b91a751b2d1576473a [diff] | |
| parent | aed7e5b79bdabbbad1c2a9a7fb05809e91b80baa [diff] |
Merge "resolve merge conflicts of 9b77c0ba32b35e71ef0dc918b23fc7a438044c1f to qt-dev-plus-aosp" into qt-dev-plus-aosp