tree 9173dfc8cf3a9d177a54598d486c7848f7b5a04b
parent 0997905b9516dd7c6d14a8a40dfb634bf159c0b7
parent de552cd230361251d23fd1ef98689155cfa018df
author Adam Cohen <adamcohen@google.com> 1585774251 -0400
committer Adam Cohen <adamcohen@google.com> 1585774251 -0400

Merging from ub-launcher3-master @ build 6356169

Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-master_rvc-dev_6356169.html

Change-Id: I6d6c61568857b3edb8e82dade84f2da5430bea72