Skip to content
Commit 86ffd08b authored by Rubin Xu's avatar Rubin Xu Committed by android-build-merger
Browse files

Merge "Merge "Fix deadlock in KeyguardDisableHandler" into qt-dev am:... 

Merge "Merge "Fix deadlock in KeyguardDisableHandler" into qt-dev am: 6cf5ea63 am: 42c4a925" into qt-r1-dev-plus-aosp
am: 6bfd0a50

Change-Id: I8ecc0a456ce245d6d5e803a74cb3f7f29cc236b7
parents 26283a24 6bfd0a50
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