Skip to content
Snippets Groups Projects
Commit ea5dc08a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "isUserInLockDown can be true when there are other... 

[automerger skipped] Merge "isUserInLockDown can be true when there are other strong auth requirements" into tm-dev am: 39515d49 am: bcac2c42 -s ours am: ac804b26 -s ours

am skip reason: Merged-In I5e979a7822dd7254b4579ab28ecf96df1db44179 with SHA-1 93149616 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25949515



Change-Id: I763f42fa26a0b6fe5bcfcb97a0cb41788a62c679
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aa15946b ac804b26
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment