tree 6bf76611bea08a8f8f0452830fa2d6f297a32805
parent 3b0f2ba40d150dacbd8e3313e0fcfee523b5e735
parent 478214d9623c71e660b07b113136eac63c0de1d0
author Hyunyoung Song <hyunyoungs@google.com> 1575763316 -0800
committer android-build-merger <android-build-merger@google.com> 1575763316 -0800

[automerger skipped] Merging from ub-launcher3-qt-future-dev @ build 6048032 am: 60fce03ac4
am: 478214d962 -s ours
am skip reason: change_id Ieee38cc301364f96cf252b2387142b0aa1b75317 with SHA1 e2fe62eea8 is in history

Change-Id: I02726345218ca0030b7ac9a3b5bb5681abb05b60