| commit | 6c85440666d997161fb6d82b4a8c17c00f195d42 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 06:03:03 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 06:03:03 2023 +0000 |
| tree | 9ab16c6c33636400fd8741b20ab26c6630f02c47 | |
| parent | 970e3bcf32aa82c9f83110a8b89a53d66d6b1861 [diff] | |
| parent | d181990b389e31e0cbbbf87fd2445ac44eb8027e [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: 4d517b4865 -s ours am: b1e88e3d2e -s ours am: 34cb892a71 -s ours am: 08f1a5c82f -s ours am: 98921ea24e -s ours am: 8384103619 -s ours am: d181990b38 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483 Change-Id: I278d61716fefa1f27aab605b3e2cdc61969b3009 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>