| commit | 14de75a370109eac53a05e50c3c1535565207e8c | [log] [tgz] |
|---|---|---|
| author | Daniel Sandler <dsandler@android.com> | Mon Aug 19 22:41:36 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 19 22:41:36 2019 +0000 |
| tree | c9c1af1666c1a10747302c94f2ed952cb610e592 | |
| parent | a269cf11da49b3a1e04a8d90361079bf84405cc7 [diff] | |
| parent | ea2314c84f0882eba0be193554ad691d56fe5f69 [diff] |
Merge "resolve merge conflicts of 07d866a10e2633902270173108eb6d9d53e31eac to qt-qpr1-sysui-dev" into qt-qpr1-sysui-dev