commit | e4f2fb56f9a7282834dccb4cd4261d60fcf77f76 | [log] [tgz] |
---|---|---|
author | Tsung-Mao Fang <tmfang@google.com> | Wed Jan 04 06:02:53 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 04 06:02:53 2023 +0000 |
tree | 6a727db3282f2a919573b799ef7b6dffb4e2ce49 | |
parent | 0a8b6a3e60d53c9f2792b3f29041c367b848b168 [diff] | |
parent | e2532f29c1eda41360ec1d46fb4fe0bf6955355b [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: e2532f29c1 -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: I778686f42178879d709967ddfb184f3619e34e37 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>