Merge "Prevent loading of Icon resources from the wrong package" into tm-dev am: e1e8b1b932 am: c4ebf2ba2a am: 3234afdaf3 am: 0f82abd147
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19601344 Change-Id: Ib40e7d42d9bc150b611a224c2768c79f096b60ac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: