diff options
| author | 2022-10-27 18:31:08 +0000 | |
|---|---|---|
| committer | 2022-10-27 18:31:08 +0000 | |
| commit | 8fe86f38dd62a6c9679a0c2f64ff39830cdc40de (patch) | |
| tree | 5905e7ad7b20187e4df41e5ec158970a362e979c /libs/androidfw/StringPool.cpp | |
| parent | 9984166e24135b958c2be9b7da14051253cc1d1d (diff) | |
| parent | 9365d2b0f4c37530ead7c2b1c90761d36b883d90 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE][SettingsProvider] key size limit for mutating settings" into tm-dev am: 24172b2784 -s ours am: 15473833c7 -s ours am: 9365d2b0f4 -s ours
am skip reason: Merged-In Ic9e88c0cc3d7206c64ba5b5c7d15b50d1ffc9adc with SHA-1 75c1d6096c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20250395
Change-Id: Ic170d278cfeea1e7c6b6eb2b5ba5bc36499ff1f3
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