tree e274c55358f1639a00ed65526b2a117f367af6bf
parent 591ff9b8e775af246baa7a91786b328ee2afec74
parent 89d0d098f09e870297047d9b8db34bd0e60e3d47
author Hyunyoung Song <hyunyoungs@google.com> 1567025534 -0700
committer Hyunyoung Song <hyunyoungs@google.com> 1567025534 -0700

Merging from ub-launcher3-qt-qpr1-dev @ build 5834630

Test: manual, presubmit on the source branch
http://x20/teams/android-sysui/merge/ub-launcher3-qt-qpr1-dev_5834630.html

Change-Id: I259c498f915bd21efbb6e5dbda7d9a6b5e6b6ca6