| commit | 8804a43d2207aea6c9cf964362fa1e861a7f22a4 | [log] [tgz] |
|---|---|---|
| author | vadimt <vadimt@google.com> | Tue Sep 17 14:44:33 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Sep 17 14:44:33 2019 -0700 |
| tree | f9bf07dbf72592782948294cbc8130fa499d85e3 | |
| parent | 1cd69ab250bc3406452c474eb663cee09fe9683e [diff] | |
| parent | c708384087fbddcb57f4e21bd8e9220afe87def2 [diff] |
resolve merge conflicts of a24ed7267c956a34f19e7a0828a8ac733647514c to ub-launcher3-qt-future-dev am: c708384087 Change-Id: I30c8c5b6541b7e5d149ae940513ea97269c61902