diff options
| author | 2022-09-07 23:17:57 +0000 | |
|---|---|---|
| committer | 2022-09-07 23:17:57 +0000 | |
| commit | 2499b9608171f0b451fb8f25876226553a902da3 (patch) | |
| tree | 3f3e6500cfde3520eb029eeb04b6ceacdf03618e /libs/androidfw/StringPool.cpp | |
| parent | b82c4ea9413e6da5335398d43cde89a53311660b (diff) | |
| parent | b62eeefe44f8c9b4751b6fb1376b600d96bcb5da (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
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19874087
Change-Id: I4e78acfab2b553ff55fd2bd81473cb3ac1c596f8
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