[automerger skipped] Merge "Merge "Resolve StatusHints image exploit across user." into sc-v2-dev am: e371b3018f" into tm-dev am: a61b7c7f4a -s ours am: 4c433e435c -s ours am: 6e14b6bd6c -s ours am: 6a3c884c3c -s ours am: 7a842c907c -s ours
am skip reason: Merged-In I6e70e238b3a5ace1cab41ec5796a6bb4d79769f2 with SHA-1 f043c230b6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23505029
Change-Id: Ifd9ae4daf56958a55abc89e91a86d7e0ffe0bfa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
committed by
Automerger Merge Worker
commit
815a99da59