| commit | b548b3c7b06dbf9c2bd6c47c5fbdbd844f06ae8a | [log] [tgz] |
|---|---|---|
| author | Jon Miranda <jonmiranda@google.com> | Thu Sep 12 16:02:58 2019 -0700 |
| committer | Jonathan Miranda <jonmiranda@google.com> | Thu Sep 12 23:13:25 2019 +0000 |
| tree | c1dd4eebf2ddf26542930bc874c43f3b15f55391 | |
| parent | 30d998c62517a235d12341f8baae9639da5903cc [diff] | |
| parent | cfdeb0620579127e2b0bba74b616b281434ffca7 [diff] |
[DO NOT MERGE] resolve merge conflicts of cfdeb0620579127e2b0bba74b616b281434ffca7 to ub-launcher3-qt-future-dev Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: Id60ae2c08ec7aca6780fec1f873920f3857d598e