| commit | 3a2298d2a4411019906401df92c5a059aceff1ec | [log] [tgz] |
|---|---|---|
| author | Jonathan Miranda <jonmiranda@google.com> | Wed Jul 29 20:42:45 2020 +0000 |
| committer | Jonathan Miranda <jonmiranda@google.com> | Wed Jul 29 20:51:30 2020 +0000 |
| tree | d4995bb0650fc18168ddcd1d96d2af75d4a927d8 | |
| parent | eb268055e1459e113298a761bda5e932129d20ff [diff] | |
| parent | 80605f9823eae5671c91f15d58d1b9d915fd7a77 [diff] |
resolve merge conflicts of 80605f9823eae5671c91f15d58d1b9d915fd7a77 to ub-launcher3-master Change-Id: I1eb6ed58b83f92105e1831c733e98ea44e0c151b