tree 5aec1f7416551a398002fef9820ea0d15d4adca1
parent 6b9595f6071e483b135b601daa3312ef930408d4
parent 51ee9cf03e680bbf780d2647dd0e597886b1717b
author Sunny Goyal <sunnygoyal@google.com> 1579803084 -0800
committer Sunny Goyal <sunnygoyal@google.com> 1579803084 -0800

Merging from ub-launcher3-master @ build 6155931

Test: manual, presubmit on the source branch
http://x20/teams/android-launcher/merge/ub-launcher3-master_6155931.html

Change-Id: I2083903dafc81c9b35437054be6a42a0612f0749