diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2019-08-14 16:31:36 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-14 16:31:36 -0700 |
commit | cee8bce1ce9501f900fdc8145d943b4958074c9d (patch) | |
tree | b80d056d89f6f825bb5ab82031ce558de64368c1 /res/values-is | |
parent | 3ad44dcc2d925ac2071ba193dc2a578ffef1264b (diff) | |
parent | 46463f6a193a8e8568efdb7f118c8759f2ddf8e6 (diff) | |
download | android_packages_apps_Trebuchet-cee8bce1ce9501f900fdc8145d943b4958074c9d.tar.gz android_packages_apps_Trebuchet-cee8bce1ce9501f900fdc8145d943b4958074c9d.tar.bz2 android_packages_apps_Trebuchet-cee8bce1ce9501f900fdc8145d943b4958074c9d.zip |
[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
Diffstat (limited to 'res/values-is')
0 files changed, 0 insertions, 0 deletions