diff options
| author | 2023-06-07 00:19:37 +0000 | |
|---|---|---|
| committer | 2023-06-07 00:19:37 +0000 | |
| commit | 3f31bbe61b546aeb6b388ca51b9fa78797a82fa1 (patch) | |
| tree | 0e4be45a3f4cfe13629d7c85cd6bfa9367d5f9cb /libs/androidfw/ObbFile.cpp | |
| parent | 32644bdad145f66eeefa848fff3fdbd2c9181099 (diff) | |
| parent | ca1abefcae647c50c91b67837bd2c5077cb91aaf (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: ca1abefcae -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20335897
Change-Id: I7821dd1021fd20ccd25a02c784c179f13e92c35a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions