| commit | 50c13af93d7938a6aed6ef8d247fff88eb16d76c | [log] [tgz] |
|---|---|---|
| author | Tsung-Mao Fang <tmfang@google.com> | Wed Jan 04 05:01:02 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 04 05:01:02 2023 +0000 |
| tree | 6efa7d885c7af5b69e2b0dd9b4a0e91044595224 | |
| parent | ff41a2c13e0b09a3b78987dc4f863e1a5b522b28 [diff] | |
| parent | e531e8e79fac342d46a78c62ac079e83d4960c0d [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20641138 Change-Id: If4f5fc112b2faa52d3f646f4deddeb327e14eb2e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>