tree 2266988e142e025338fc9985431e6c9a421e3f5d
parent a39d671d0b3ac55835dfd6506cfa82e019589503
parent 057059665ebb1277626e01317ae999ffc0453d39
author Hyunyoung Song <hyunyoungs@google.com> 1568672622 -0700
committer Hyunyoung Song <hyunyoungs@google.com> 1568672977 -0700

resolve merge conflicts of 057059665ebb1277626e01317ae999ffc0453d39 to ub-launcher3-master

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