| commit | c708384087fbddcb57f4e21bd8e9220afe87def2 | [log] [tgz] |
|---|---|---|
| author | vadimt <vadimt@google.com> | Tue Sep 17 13:03:18 2019 -0700 |
| committer | vadimt <vadimt@google.com> | Tue Sep 17 13:03:18 2019 -0700 |
| tree | 19ddcb7e446e55933ba9a63b2195c0f5ee82e82a | |
| parent | bf7371e510c4d2419a65869fc4971804ea296981 [diff] | |
| parent | a24ed7267c956a34f19e7a0828a8ac733647514c [diff] |
resolve merge conflicts of a24ed7267c956a34f19e7a0828a8ac733647514c to ub-launcher3-qt-future-dev Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I89f3bcf309b10a359b12167474fcb3f93640787f