diff options
| author | 2022-09-08 00:49:22 +0000 | |
|---|---|---|
| committer | 2022-09-08 00:49:22 +0000 | |
| commit | b4177575e11f55c5f2f3864a3c72d5c5951d5a6b (patch) | |
| tree | ee2819d13fcd9d89dd34fb38ad4aece3cb830f7b /libs/androidfw/StringPool.cpp | |
| parent | 99fa10e1b4e2efb4140a4b17984825ab3b5b4313 (diff) | |
| parent | 8f8d4940e62316b76d89d4513832953c47e11303 (diff) | |
[automerger skipped] 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: 7a601f8e70 -s ours am: c89d81e29b -s ours am: 8f8d4940e6 -s ours
am skip reason: Merged-In I1ab2b7228470f10ec26fe3a608ae540cfc9e9a96 with SHA-1 8c2c7b4164 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19874087
Change-Id: Ib6899a144fe68c4ecc921f2bf24d9c677fc4a4f1
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