diff options
| author | 2023-02-23 21:23:59 +0000 | |
|---|---|---|
| committer | 2023-02-23 21:23:59 +0000 | |
| commit | 14549f90999fe2c6e5ddf9efd8240b3bc2894990 (patch) | |
| tree | f72082ccc8290c1142a202d2f872bcdc6bd17816 /libs/androidfw/StringPool.cpp | |
| parent | 53e03640ee17a707da372bc90987d4052b8a93d2 (diff) | |
| parent | 2499b9608171f0b451fb8f25876226553a902da3 (diff) | |
Merge "[conflict] [conflict] Merge "Validate package name passed to setApplicationRestrictions." into qt-dev am: 0b5ceb8cd2 am: 9f864c4b23 am: ef2a1d60be am: 043b90b360" into sc-dev am: b62eeefe44 am: 2499b96081
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19874087
Change-Id: I0d55e639b3ed40374acc1268edf2279547f6a78c
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