| commit | 96aa5fc1831dc7c3e2aa01445d48bf76071ea8c4 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 01:37:31 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 01:37:31 2023 +0000 |
| tree | 61792c7b44719985996c805a1d5a440d56710ed7 | |
| parent | 7b4b95869e09bce7f08f3dc1382753104e932046 [diff] | |
| parent | 6b6765b146c75d569c3c0c94bdb765ea855a7b76 [diff] |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 976fd54a43 -s ours am: 4306517b07 -s ours am: 6b6765b146 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300602 Change-Id: I3dec753caa2d864176667d3c0a5e70c3bbe16ff8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>