summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Aishwarya Mallampati <amallampati@google.com> 2023-06-06 21:55:39 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-06 21:55:39 +0000
commitd97399579b980fa7ea4dcda0aa3755e476a5c1c4 (patch)
tree4958f9ee435b49879ef1a91d142552d94871a225 /libs/androidfw/FileStream.cpp
parent2b71a91e85a1e216113601f9cdb77b55a8b02cff (diff)
parentab34cf4e8ee2339f992e52523ca4d9905a85059b (diff)
[automerger skipped] Merge "DO NOT MERGE Grant carrier privileges if package has carrier config access." into sc-dev am: 87cd3bb999 am: 8df2f71a8d -s ours am: 368d47ce0e -s ours am: ab34cf4e8e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20341111 Change-Id: If8e122ddfd95566627936dbb704e7e13a3e7bda7 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