Skip to content
Commit 8f182abb authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Merge "Shortened and adjustable screen timeouts" into qt-r1-dev am:... 

Merge "Merge "Shortened and adjustable screen timeouts" into qt-r1-dev am: 969c3d9b" into qt-r1-dev-plus-aosp
am: 70601671

Change-Id: Ie2f3a219e60d8b63d16360a3ae4bc5d109125b55
parents e6936e27 70601671
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