Skip to content
Commit 13c70441 authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter.""... 

Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev
parents 4a88acfc 0dad5720
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