summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Nan Wu <wnan@google.com> 2023-09-05 16:58:41 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-05 16:58:41 +0000
commit278e800d9592ddeee6506d87325e168da9fc9a94 (patch)
treed977b0e684f2d9e5368e79fd00e8320c19b97f40 /libs/androidfw/FileStream.cpp
parent5d35c9a622abe8da613975be64147daf65239739 (diff)
parent48570b4b4b778a660b57731172b9475bc0f2adc2 (diff)
Merge "[automerger skipped] Merge "Rescind BAL privilege when ShortcutService sends the callback PI" into udc-dev am: 4c452c359c am: d432d793cf am: 3ef223def1 -s ours" into udc-qpr-dev-plus-aosp am: 48570b4b4b -s ours
am skip reason: Merged-In I2df9de272192c9a149a9ff519c96e6e0e8304040 with SHA-1 eb90469587 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24005105 Change-Id: Ie9cdd96b031032c3f344fb8da6facfbc9f1353fe 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