tree bd23dc632d0aa129ffaf64326011387fd88ff8f1
parent 478414a7c3318c57f35a3413d0e2a5d7afcaa2f9
parent 735d1fe124812fd11feabc644c9a4f8482039f57
author Jon Miranda <jonmiranda@google.com> 1568067337 -0700
committer Jonathan Miranda <jonmiranda@google.com> 1568068189 +0000

[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