tree a4049f35c2e0b1c3ded2166dd5e0af8a74b01d77
parent 2804cfadb8fe5b269748c1c4dad645469ff637f1
parent 9734ae5a43c42ce80c02c4e5ddc38fec7d01d4e5
author Kunal Malhotra <malhk@google.com> 1696395337 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696395337 +0000

[automerger skipped] Merge "Adding in verification of calling UID in onShellCommand" into rvc-dev am: 7c905e103a am: ca34073d93 am: 8f6b8d313d am: 868bc803ff am: 264a36f6d0 am: 632a8b8a43 am: 7ffa627afc am: 9991339676 -s ours am: 92c1d53ff7 -s ours am: 394767364e -s ours am: 9734ae5a43 -s ours

am skip reason: Merged-In I68903ebd6d3d85f4bc820b745e3233a448b62273 with SHA-1 3ef3f18ba3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058898

Change-Id: I86ad5c68fe6b747f1a69c054b9374a8517367bdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>