summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-04 04:55:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-04 04:55:54 +0000
commitae3bf11f5beef341adab0a3300ab517f42021213 (patch)
treea4049f35c2e0b1c3ded2166dd5e0af8a74b01d77 /libs/androidfw/FileStream.cpp
parentf10f746fa37a7e2a84b098fd5117fc029f7a876b (diff)
parentf6e7cdb00d810a5c4f7ca4289940b17eba6c70c3 (diff)
Merge "[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" into udc-d1-dev-plus-aosp am: f6e7cdb00d -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: Ic965eb0931f75e726be93d5072fdc4d12bd41510 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions