| commit | 9370592e23cd3dd6dbf514fa21f4c17b76d60911 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Mon Oct 01 11:41:11 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 01 11:41:11 2012 -0700 |
| tree | 10a4f3774f367bee3fd9a56c0d34868ae8a27e3b | |
| parent | 586439676fdec80d5e0c6151fc17bb52be5cc6b0 [diff] | |
| parent | 5d359a92658d01b0220f77eb294d6124848739bc [diff] |
am 5d359a92: am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev * commit '5d359a92658d01b0220f77eb294d6124848739bc': Remove clearUserActivityTimeout().