Skip to content
Commit 1a092c1f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow userActivityTimeout override when keyguard is showing." into... 

Merge "Allow userActivityTimeout override when keyguard is showing." into rvc-dev am: 46806c75 am: b5870541 am: 0ec8cbcf

Change-Id: I388bf97ce0921397d3fff187457e4bbe5b4df0c0
parents 6b9b55d2 0ec8cbcf
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