| commit | 36e39535388b3621642292ec300c291a1e8096a2 | [log] [tgz] |
|---|---|---|
| author | Jon Miranda <jonmiranda@google.com> | Mon Sep 09 15:15:37 2019 -0700 |
| committer | Jonathan Miranda <jonmiranda@google.com> | Mon Sep 09 22:29:49 2019 +0000 |
| tree | bd23dc632d0aa129ffaf64326011387fd88ff8f1 | |
| parent | 478414a7c3318c57f35a3413d0e2a5d7afcaa2f9 [diff] | |
| parent | 735d1fe124812fd11feabc644c9a4f8482039f57 [diff] |
[DO NOT MERGE] Merge commit '735d1fe124812fd11feabc644c9a4f8482039f57' into manual_merge_735d1fe124812fd11feabc644c9a4f8482039f57 The ub-launcher3-qt-future-dev branch cut missed the CLs that went into ub-launcher3-master, so the merge failed Change-Id: I4f6f5ca8323350af3bc84c72d61d935b36f8064f