diff options
| author | 2022-09-06 21:45:14 +0000 | |
|---|---|---|
| committer | 2022-09-07 16:04:16 +0000 | |
| commit | dec1838eed75e88167be5ad380693526bec6ce53 (patch) | |
| tree | 1884e6d7e25970f379da5dc846c7aa5b13d19774 /libs/androidfw/StringPool.cpp | |
| parent | 8449f44bcf243895936e50001f2e4f0ac7caed6e (diff) | |
| parent | 043b90b360c32213bed1ba9e4d6936ad4e2657b2 (diff) | |
[conflict] [conflict] Merge "Validate package name passed to setApplicationRestrictions." into qt-dev am: 0b5ceb8cd2 am: 9f864c4b23 am: ef2a1d60be am: 043b90b360
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19861873
Bug: 239701237
Change-Id: I246b5eea02417167138431cfaee5f3beb88f03ea
Merged-In: I1ab2b7228470f10ec26fe3a608ae540cfc9e9a96
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