Skip to content
Commit f44c5740 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

[automerger skipped] Merge "RESTRICT AUTOMERGE Update keyguard locked state... 

[automerger skipped] Merge "RESTRICT AUTOMERGE Update keyguard locked state from TrustManagerService" into qt-dev am: 3c115495 am: 4dd9f6e1 -s ours am: 75b8097b

Change-Id: If8aabf016607e2a04858f45d768ec9cb460950a7
parents f9d76915 75b8097b
Hide whitespace changes
Inline Side-by-side
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