tree 6a31bc8b4ae7bb85f7cccad5c14afc158bc625d7
parent 77762fdf4f7b317474ba693f43c92f11848ec16c
parent bdd6522661e4a062ed575cf2d452d059b8826886
author Winson Chung <winsonc@google.com> 1589411513 -0700
committer Winson Chung <winsonc@google.com> 1589412138 +0000

Merging from ub-launcher3-rvc-dev @ build 6492476

Bug: 150504032
Test: manual, presubmit on the source branch
    x20/teams/android-launcher/merge/ub-launcher3-rvc-dev_rvc-dev_6492476.html
Change-Id: I96b36965f7b471eb77aa78a8b923ed9298e8a02f