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