| commit | 970e3bcf32aa82c9f83110a8b89a53d66d6b1861 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 06:02:57 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 06:02:57 2023 +0000 |
| tree | 9ab16c6c33636400fd8741b20ab26c6630f02c47 | |
| parent | 5d3e350b82b4b60871ba52a6fa4b94cad6024147 [diff] | |
| parent | dabfd4e77bb62d222446c51e832f5a4fe6b672bc [diff] |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: f0f020c21f -s ours am: 3b8290a881 -s ours am: 7d29675ebd -s ours am: e7ef06df70 -s ours am: a0dc510a49 -s ours am: affb156d85 -s ours am: a2f4bceba0 -s ours am: c939100250 -s ours am: dabfd4e77b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483 Change-Id: I5ce95826f4cdf470209fcaa071a9c90d5904cb8f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>