diff options
| author | 2023-08-08 04:38:21 +0000 | |
|---|---|---|
| committer | 2023-08-08 04:38:21 +0000 | |
| commit | 0aaf5cf83f9fa60f82cd7bac286e7b64902502b2 (patch) | |
| tree | 92def060ea4b4d4b32db7bd8b37435caeaf17d6f /libs/androidfw/StringPool.cpp | |
| parent | 63db4c1be2095c3bdfe1d5a6a36f05f6aa4c1ab0 (diff) | |
| parent | 91567e9b8647914227736a94a324662f4bb15772 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into rvc-qpr-dev am: 6ff8b636ee -s ours am: 91c3b175ac -s ours am: 3029dc01e5 -s ours am: ed968a1c43 -s ours am: 324233db2c -s ours am: 91567e9b86 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301360
Change-Id: I058df105d19e6354c6803a17fbd4f728767af4bf
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