| commit | d72857950461c1b82ce80f85bf359c050c0f0b0c | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Aug 10 16:28:35 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 10 16:28:35 2020 +0000 |
| tree | d16655439c9a6add1345bb18c875573a51f54096 | |
| parent | f3bc79718201cf17479a46e9860ea518a900d68f [diff] | |
| parent | 1a965c190d07140690602761c497495ad1875d03 [diff] |
Merge "resolve merge conflicts of 3a22956f0a6214285500ac040b4ae565d882cc47 to ub-launcher3-master" into ub-launcher3-master