| commit | a87abbad31ac1f7889803f60cda55db979a03e9f | [log] [tgz] |
|---|---|---|
| author | Jon Miranda <jonmiranda@google.com> | Fri Sep 06 11:35:34 2019 -0700 |
| committer | Jon Miranda <jonmiranda@google.com> | Fri Sep 06 11:35:34 2019 -0700 |
| tree | 98806ec8037ee844595200978bed368d61692fa7 | |
| parent | 72fddba837afb28ad31f775b566ee4ba3f02eab9 [diff] | |
| parent | 1bd96b1e96a663c835cb263cbc4aa54a7841ab28 [diff] |
resolve merge conflicts of 1bd96b1e96a663c835cb263cbc4aa54a7841ab28 to ub-launcher3-qt-future-dev Test: I solemnly swear I tested this conflict resolution. Bug: None Change-Id: Ide6c914d4e69eb4fa70d6634780324cd45a21610