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 05:26:37 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-04 05:26:37 +0000
commit9d4bec9b07914788740a04d69644664bcb90f34b (patch)
treeab30c95b629b64b82697a7cd40239d7198521089 /libs/androidfw/FileStream.cpp
parentc84ac6a15be96960842178d6c71e46b6f40d6ae6 (diff)
parent92e234503fe01b10791eeb1ae5ddbd709c1ea4ab (diff)
[automerger skipped] Merge "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: fe967cb3b4 am: aaaf2b6cec am: 820883f26e am: df661ad61f" into udc-qpr-dev-plus-aosp am: 92e234503f -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: I6802b3e78bc6ae00baa5e46e1645a7acd93fa6ed 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