diff options
| author | 2023-08-08 01:55:29 +0000 | |
|---|---|---|
| committer | 2023-08-08 01:55:29 +0000 | |
| commit | 956e171ab14d0d7edc01c33948d7e965b9494d94 (patch) | |
| tree | 9ab16c6c33636400fd8741b20ab26c6630f02c47 /libs/androidfw/StringPool.cpp | |
| parent | 469608c4f96ecfa7b637f7002bd9ddb59c89df53 (diff) | |
| parent | 893b9261fd45c0e9a9568e923fdcea6685050876 (diff) | |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: efc2b69c88 -s ours am: 893b9261fd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300599
Change-Id: I937135a2863691439008d039cd220180d028361e
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