| commit | 0a07dfa25da678a51b88bbc40199fd54fadf44ad | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Sep 09 20:47:27 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Sep 09 20:47:27 2019 +0000 |
| tree | baa92cd7f89af927d77d682f84c8949e303edd44 | |
| parent | ac6f69f78d4d8d58b12cc58e2074181aca28a1ba [diff] | |
| parent | a87abbad31ac1f7889803f60cda55db979a03e9f [diff] |
Merge "resolve merge conflicts of 1bd96b1e96a663c835cb263cbc4aa54a7841ab28 to ub-launcher3-qt-future-dev" into ub-launcher3-qt-future-dev