tree 0025ce072c4e1f7fd79676c9bee184f46f4b5fcc
parent 388a2122b10579b1654010034b96a4b2c367bb07
parent 570d9a1e9c7ad2d9b40f1aaa27a43b19a9bede64
author Pinyao Ting <pinyaoting@google.com> 1568739257 -0700
committer android-build-merger <android-build-merger@google.com> 1568739257 -0700

Merge changes from topic "cache-shortcut-image" into ub-launcher3-qt-future-dev
am: 570d9a1e9c

Change-Id: I3182c90a69d1c93daf8d33cfe7f15f613ac972fd