| commit | 5d359a92658d01b0220f77eb294d6124848739bc | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Mon Oct 01 11:39:30 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 01 11:39:30 2012 -0700 |
| tree | 1665bb06f5806abb7111748377f5993c4f41e8f7 | |
| parent | 21a80ff4d1a557d8e33f86a218d204c0093fefc7 [diff] | |
| parent | 5e3dcf7210bed65d8f9aec40d9da078daf76dead [diff] |
am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev * commit '5e3dcf7210bed65d8f9aec40d9da078daf76dead': Remove clearUserActivityTimeout().