commit | ecf1846617cb6b3911d354db846dabbee2f3e973 | [log] [tgz] |
---|---|---|
author | Arc Wang <arcwang@google.com> | Wed Jan 04 02:55:19 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 04 02:55:19 2023 +0000 |
tree | d675f6ea0a132aecfa8668e45b01abb8a27ea84b | |
parent | 38ee0a345acb957272892fbd6db18e47dfab3056 [diff] | |
parent | eeafd49d4e1cac63d97475250b494e5ea9589a8f [diff] |
[automerger skipped] Merge "FRP bypass defense in the settings app" into sc-v2-dev am: 9a6c84c47e -s ours am: eeafd49d4e -s ours am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640992 Change-Id: Ic02f075561163bbe76ec94cea2640e1bbdee5915 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>