diff options
| author | 2023-06-07 01:50:57 +0000 | |
|---|---|---|
| committer | 2023-06-07 01:50:57 +0000 | |
| commit | 0efb38018150a239ef02e319a49cffbb41f5fbf4 (patch) | |
| tree | 422189b7f1d73f05b162a90723f650baffd04993 /libs/androidfw/StringPool.cpp | |
| parent | b7bea4cbe17fde89a01522fb5461a62e889273fc (diff) | |
| parent | 50aa5a81204ebd44076b59d89685b47fa72f140e (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: 50aa5a8120 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20342565
Change-Id: I141c843481f8aa1e426eb563fd6035c09036228f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions