| commit | 13c7044186b90f7f63e7a17996222edfb18460f5 | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Fri Feb 06 19:35:42 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Feb 06 19:35:43 2015 +0000 |
| tree | 5b93327c32d541f6c5d448b184ccffb231c38b8f | |
| parent | 4a88acfcc30544fa3424020b1c071d2954a47cb2 [diff] | |
| parent | 0dad5720902fad041bc8e2221953aab6dd1d2d8f [diff] |
Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev