summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Aishwarya Mallampati <amallampati@google.com> 2023-06-07 01:03:31 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-07 01:03:31 +0000
commitb07f41ea0ed31af7752707c754e0d57afd0a79e9 (patch)
treec65983cec4816cbca22240b1dead43d30680ed3c /libs/androidfw/FileStream.cpp
parentf9c8750d992948e5a4affe94eff2c39e5ec61b3c (diff)
parentd0fa7c0b36d2df8c5db9bbae86ab2366513cbaf9 (diff)
[automerger skipped] Merge "DO NOT MERGE Grant carrier privileges if package has carrier config access." into rvc-qpr-dev am: 3a9e1c2bc1 -s ours am: 82c20b69ce -s ours am: 7f16e54187 -s ours am: 9cdde1b1cc -s ours am: 5b1db02d86 -s ours am: 15720500ec -s ours am: d0fa7c0b36 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20335897 Change-Id: Ic8c28be4128c5c3629fccce1db080cb74b8a92fb 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