tree a7de44af6239cd25b2241bbfbd7addb0a080e36d
parent 0a46bae0eb0e75e7ee1e0981d3d9dd5d479e7825
parent 8f6c338fd65f3b51cb952b5e7359adbba972154e
author Fabian Kozynski <kozynski@google.com> 1597078772 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597078772 +0000

[automerger skipped] Introduce a CustomIconCache for editing favorites am: 95e63154f8 am: 8f6c338fd6 -s ours

am skip reason: Change-Id I8ac2e1ee983ad8ab714f050edaa8981a2307beca with SHA-1 8f659543fa is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12345483

Change-Id: Ib515c85d086a7ccacaa48abab528854794f067b9