tree 8bd26b64e2168cff14f9cbf6566d73e829366c21
parent fb553edbee37f11131f6a6b880cf906cefb2a063
parent 8a739f9511cc3833fdd9df33ce35bd6126ba1ea4
author Pinyao Ting <pinyaoting@google.com> 1568328699 -0700
committer Pinyao Ting <pinyaoting@google.com> 1568329496 -0700

resolve merge conflicts of 8a739f9511cc3833fdd9df33ce35bd6126ba1ea4 to ub-launcher3-master

Bug: None
Change-Id: Ieb5ae70464d4fa964622310c67e0dd4b58660cc3
Test: I solemnly swear I tested this conflict resolution.