| commit | 4d517b4865ffcaa2902615c58bc356fa06f6b3be | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 01:57:24 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 01:57:24 2023 +0000 |
| tree | cb057c1090bd7b27d40a13a5c66063f9449cae4e | |
| parent | 7d29675ebdc70459a46cd9e6fce76373d59e86a0 [diff] | |
| parent | 26068ce8741620f5e1d651a859ebdc4b513ae545 [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into rvc-dev am: c1aa2bb360 -s ours am: 26068ce874 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483 Change-Id: I9a4c04c6ed886fc20af735eb5ae9f922c23b13ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>