diff options
| author | 2023-08-08 03:51:55 +0000 | |
|---|---|---|
| committer | 2023-08-08 03:51:55 +0000 | |
| commit | 7be14722b4900c2706b0f2a78cc2652a98eebede (patch) | |
| tree | d72875ddd02a38f67dcb3d4629ea01f1ba7eb2c8 /libs/androidfw/StringPool.cpp | |
| parent | cc18bdd47da67ad26220127a4a1657912c0e6afe (diff) | |
| parent | d1dee4da208e016402cb5bc70275c42c0b901725 (diff) | |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: a7ea34724f -s ours am: a242d36b8c -s ours am: c2c6cdd1cd -s ours am: aee7da70e4 -s ours am: d1dee4da20 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300600
Change-Id: I27e429baaf8c846e6f9c2d4f4771ab8004df8b88
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