tree 7ab1feb0e611129984b49d4d3c50ace5fedaaa0c
parent 1b5d7ea6f8260a7db47e742a33ad5aba2d2e16ed
parent e5221b04790a930222fcd38eb8107ceb1dceffe1
author Hyunyoung Song <hyunyoungs@google.com> 1542672422 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1542672422 +0000

Merge changes from topic "am-71b42e3a-02e4-4dc2-9f82-6d74158b505a" into ub-launcher3-master

* changes:
  [automerger skipped] [DO NOT MERGE] Fix clipping issue on adaptive icons skipped: 34973c93e4
  [DO NOT MERGE] Fix clipping issue on adaptive icons