diff options
| author | 2023-08-08 01:55:34 +0000 | |
|---|---|---|
| committer | 2023-08-08 01:55:34 +0000 | |
| commit | 14b4bda0fb31b77d2afd31926129f50cdf37d522 (patch) | |
| tree | 9ab16c6c33636400fd8741b20ab26c6630f02c47 /libs/androidfw/StringPool.cpp | |
| parent | 956e171ab14d0d7edc01c33948d7e965b9494d94 (diff) | |
| parent | c8c490b9025372b537aeb894bed26a7e3eaf9787 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into tm-qpr-dev am: 63d6d79a6a -s ours am: c8c490b902 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300599
Change-Id: Ic76c543911e7021693bcf09e1bcb07caabfe5e44
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