[automerger skipped] Merge "Adding allocation size check when creating arrays in java parcel" am: 1309034db0 am: e804ace98c am: 39e4d9a782 am: caa827e088 am: e3cf33efc9 am: b2ac643e76 -s ours
am skip reason: Merged-In I8c728166540f22ebaded5025f7b3190568da5a6b with SHA-1 b4c9d9ad1f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2573576
Change-Id: I66b8fe0a4c6861ec295db9a0f0c82af5e89bed3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: