Skip to content
Commit ae54fae4 authored by Suprabh Shukla's avatar Suprabh Shukla Committed by android-build-merger
Browse files

Merge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev 

am: f5e51cf7

Change-Id: Ic44c61742ba56f887cf90ab6428b8c8642e355e3
parents 925a30e8 f5e51cf7
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