tree 10a4f3774f367bee3fd9a56c0d34868ae8a27e3b
parent 586439676fdec80d5e0c6151fc17bb52be5cc6b0
parent 5d359a92658d01b0220f77eb294d6124848739bc
author Jeff Brown <jeffbrown@google.com> 1349116871 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349116871 -0700

am 5d359a92: am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev

* commit '5d359a92658d01b0220f77eb294d6124848739bc':
  Remove clearUserActivityTimeout().