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:28:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-04 05:28:06 +0000
commit1f74c31bde69ef748c72f328a90de8ee1e9208ec (patch)
treeab30c95b629b64b82697a7cd40239d7198521089 /libs/androidfw/FileStream.cpp
parentb12cebe0eff6af114db0059591ca7fa98b18b62a (diff)
parent9459a24409cff926d4d2ec4d334486300295cb6e (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: ffb3a20b9f -s ours" into udc-d1-dev-plus-aosp am: 687e706a7f -s ours am: 9459a24409 -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: I5f203a4f07fa36f59ef6794960aeecf1cc024157 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