[automerger skipped] [automerged blank] Prevent exfiltration of system files via avatar picker. 2p: 1b48ca6b7f 2p: fd3945a3f4 am: 0187e7f5e3 -s ours am: 524499af19 -s ours
am skip reason: Merged-In Idf1ab60878d619ee30505d71e8afe31d8b0c0ebe with SHA-1 1325574d3a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19748987
Change-Id: I0f4718c91095ed1a194a9cdc0c944f6a7be338a7
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
c03ff64296