| commit | 5d3e350b82b4b60871ba52a6fa4b94cad6024147 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 06:02:24 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 06:02:24 2023 +0000 |
| tree | 9ab16c6c33636400fd8741b20ab26c6630f02c47 | |
| parent | 7246dfd31fde43ce212056a72f8be1f67ca7b48a [diff] | |
| parent | 73d0008bdb1f8e11ae0d63e703d5f4058d022e53 [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into rvc-qpr-dev am: 6ff8b636ee -s ours am: 91c3b175ac -s ours am: 3029dc01e5 -s ours am: ed968a1c43 -s ours am: 324233db2c -s ours am: 693a6c22cc -s ours am: 7718d7a585 -s ours am: 73d0008bdb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301360 Change-Id: I63847dca250e9031e51072f8b55b989bf7a047ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>