commit | f035fc4554f5d4b29158c1f54850fbd28a13c68d | [log] [tgz] |
---|---|---|
author | Arc Wang <arcwang@google.com> | Wed Jan 04 03:56:27 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 04 03:56:27 2023 +0000 |
tree | 82bb71ee0d29e256413d32ed30c1cb46d06298f9 | |
parent | d136453d402285c78b9068bd97e8413eb822fa4d [diff] | |
parent | 999bc0b0d0bc68b509dca18135ef07befced28f0 [diff] |
[automerger skipped] Merge "FRP bypass defense in the settings app" into sc-v2-dev am: 9a6c84c47e -s ours am: eeafd49d4e -s ours am: ecf1846617 -s ours am: 999bc0b0d0 -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: I204c1a02bacac6ad5dabd119cdf12530605961a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>