| commit | d181990b389e31e0cbbbf87fd2445ac44eb8027e | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 05:20:23 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 05:20:23 2023 +0000 |
| tree | 92def060ea4b4d4b32db7bd8b37435caeaf17d6f | |
| parent | dabfd4e77bb62d222446c51e832f5a4fe6b672bc [diff] | |
| parent | 838410361994bcdadedebec5dd7ec819356ec8ba [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483 Change-Id: Iaa1e5f7e9923cf154213b9e00f8243e072dbd972 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>