| commit | a9d870828c0edc07b860aa120fe50e7ad47b5926 | [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:52:44 2019 +0000 |
| tree | 973e6ee198771f0e8b493a97c267992dd1927534 | |
| parent | f2a3e79e765036e3c8781b594c2eb1922419e74a [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