Commits
Jeff Brown authored and Android Git Automerger committed 9370592e23cM
am 5d359a92: am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev * commit '5d359a92658d01b0220f77eb294d6124848739bc': Remove clearUserActivityTimeout().
Showing diff to586439676fd