commit | 83307c935e386d3df85fa096276dd4bcddd40e40 | [log] [tgz] |
---|---|---|
author | Joshua Mccloskey <joshmccloskey@google.com> | Thu Nov 03 03:07:39 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 03 03:07:39 2022 +0000 |
tree | 28ba6269dee258159cf1296b0a57b18c4b24f231 | |
parent | 1cda0a841824a683711af08a3e0399749b5a9019 [diff] | |
parent | 4033cc7d0e47aa164bc7e4b8bcfb99118edd2564 [diff] |
[automerger skipped] Merge "Implement SFPS “require screen on to auth”" into tm-qpr-dev am: db266ca6b2 am: 4033cc7d0e -s ours am skip reason: Merged-In Ia44604b059c4847c40608419b2e16219976ced3e with SHA-1 73bf45ee4b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20215190 Change-Id: Ia988b3cd1f05732c5a76be35503b11c3c14de84a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>