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

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

Change-Id: I39355e6221a97a5535c37d67411cd1c6f98c3505
parents ddc948b4 46806c75
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