Skip to content
Commit 60d17978 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

[automerger skipped] Merge "WM: Prevent secondary display focus while keyguard... 

[automerger skipped] Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev am: f04714c5 am: 6281d642
am: 668761b1  -s ours

Change-Id: Icf2ed114aa3c2bf500ea59c3f52ec75d0f73ff84
parents 842ec508 668761b1
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