Skip to content
Commit 0ec8cbcf 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

Change-Id: Ifeacd2f54ba2db6dc6cea057f93f9656ccd34332
parents a8d0f57d b5870541
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