diff options
| author | 2023-06-07 01:06:22 +0000 | |
|---|---|---|
| committer | 2023-06-07 01:06:22 +0000 | |
| commit | 50aa5a81204ebd44076b59d89685b47fa72f140e (patch) | |
| tree | 6ac3dd1f0ac53dbc2b3ca97f1f26412d38df4a3b /libs/androidfw/ObbFile.cpp | |
| parent | 033e4383a42c48b6f8b5676efac8903a452261ae (diff) | |
| parent | 4188bb6ed78378fd1a30be9048f0c085b93a4941 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Grant carrier privileges if package has carrier config access." into rvc-dev am: 432eb6d7eb am: ebe1be1bf0 -s ours am: 3b69f55309 -s ours am: 31b36202e0 -s ours am: f44f39cc62 -s ours am: c55ad46b12 -s ours am: d618ba9c1e -s ours am: 7306cd5978 -s ours am: 4188bb6ed7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20342565
Change-Id: I2db69d8bb93bf67fd307824152fd23288e748e8a
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