| commit | e2532f29c1eda41360ec1d46fb4fe0bf6955355b | [log] [tgz] |
|---|---|---|
| author | Tsung-Mao Fang <tmfang@google.com> | Wed Jan 04 05:43:01 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 04 05:43:01 2023 +0000 |
| tree | 82bb71ee0d29e256413d32ed30c1cb46d06298f9 | |
| parent | 9c43d60fd1b8ea344f666c1bfa6680256cbf8886 [diff] | |
| parent | 50c13af93d7938a6aed6ef8d247fff88eb16d76c [diff] |
[automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8 -s ours am: 4332b3266e -s ours am: ac092ac06f -s ours am: a5904fed59 -s ours am: 322e0d684d -s ours am: 6800574d8d -s ours am: e531e8e79f -s ours am: 50c13af93d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20641138 Change-Id: Idfdac838b857f7bd159d303c0e5b7a6c637f6a5c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>