diff options
| author | 2023-02-23 21:35:22 +0000 | |
|---|---|---|
| committer | 2023-02-23 21:35:22 +0000 | |
| commit | e7430bfc28a4dc0386370869c581bd1724495c0e (patch) | |
| tree | 9dcdefea644b73d68a916fac7bc92745f4caf2b5 /libs/androidfw/StringPool.cpp | |
| parent | 70c861eab01a51d9560cd71ed3bce4d692dc3c1f (diff) | |
| parent | 14549f90999fe2c6e5ddf9efd8240b3bc2894990 (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 am: 14549f9099
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19874087
Change-Id: I247ec27bcc6c3f9549bc53de216d5fb4950091f5
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