| commit | 1ac98548a73e6c82876433c5ab0f037c6da688cd | [log] [tgz] |
|---|---|---|
| author | vadimt <vadimt@google.com> | Thu Oct 03 13:34:28 2019 -0700 |
| committer | Vadim Tryshev <vadimt@google.com> | Thu Oct 03 20:58:15 2019 +0000 |
| tree | ac22e242e3e63404641268402d5f19ccdcfedd9c | |
| parent | 055c22e8e658dcb87447a9c11ec492c2b8e922e5 [diff] | |
| parent | 08776ada1e37c4b424893306c058b1de9f85903f [diff] |
resolve merge conflicts of 08776ada1e37c4b424893306c058b1de9f85903f to ub-launcher3-qt-future-dev Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I9a3b0f67ee874b5ec4ad67f41a46ec7876d19082 Merged-in: I9a3b0f67ee874b5ec4ad67f41a46ec7876d19082