tree b80d056d89f6f825bb5ab82031ce558de64368c1
parent 3ad44dcc2d925ac2071ba193dc2a578ffef1264b
parent 46463f6a193a8e8568efdb7f118c8759f2ddf8e6
author Sunny Goyal <sunnygoyal@google.com> 1565825496 -0700
committer android-build-merger <android-build-merger@google.com> 1565825496 -0700

[automerger skipped] Merge "Adding support for storing keywords in iconCache" into ub-launcher3-qt-qpr1-dev
am: 46463f6a19 -s ours
am skip reason: change_id I1183e63a6556ebfb3eee5df23d149e09728193a9 with SHA1 934ebd087b is in history

Change-Id: I443b1b497073c3c2fbea029c8a7779aaec4001d2