| commit | 98921ea24e2cf7c684a348ee669ad69d1c23d94c | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 03:51:23 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 03:51:23 2023 +0000 |
| tree | 61792c7b44719985996c805a1d5a440d56710ed7 | |
| parent | a2f4bceba0529894d259a67bb30894aa34fbd2da [diff] | |
| parent | 08f1a5c82f1db0398fb4a865969592f5ffcf49b9 [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483 Change-Id: I08c8639b1ff5d3cb5a76bb32565b213f99c99a31 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>