| commit | 571f185a5acb4f99e46e8ae3b0e5934cd124c80e | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 01:36:55 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 01:36:55 2023 +0000 |
| tree | 61792c7b44719985996c805a1d5a440d56710ed7 | |
| parent | 7dcebe69440db9db6cea4d338e50b2f0940d3faf [diff] | |
| parent | a242d36b8ce437fc37ad5f5d7ee6c32fdb6ae9f8 [diff] |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: a7ea34724f -s ours am: a242d36b8c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300600 Change-Id: I3194a85b8ba7b493c4558bc6c2bd7553d828bca7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>