| commit | c8c490b9025372b537aeb894bed26a7e3eaf9787 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 01:32:26 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 01:32:26 2023 +0000 |
| tree | 88d43b4fcdd60404bcdd70214c9bb8e534846a12 | |
| parent | 893b9261fd45c0e9a9568e923fdcea6685050876 [diff] | |
| parent | 63d6d79a6ae98ad2f7f9bf4c03c2a8737999d21d [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into tm-qpr-dev am: 63d6d79a6a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300599 Change-Id: Iae4a25669ca4f5cd883caef5fea2d3607550dca4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>