Skip to content
Commit bde9aa11 authored by Gus Prevas's avatar Gus Prevas Committed by android-build-merger
Browse files

[automerger skipped] Merge "Checks keyguard earlier when blocking... 

[automerger skipped] Merge "Checks keyguard earlier when blocking notifications." into pi-dev am: e7ca4fe6
am: 30afdb38  -s ours

Change-Id: If903b4d446c5305c34a898b140793b42b73bb284
parents 7d9a25e3 30afdb38
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