Commits
Bryce Lee authored and Android Git Automerger committed 28209111cc7M
am 53b9fbd1: Expose userActivityTimeout through @SystemApi getter/setter. * commit '53b9fbd1610b6d3deb837dab34fd309d515f6385': Expose userActivityTimeout through @SystemApi getter/setter.
Showing diff toa20e430d0ab