| commit | a20e430d0ab8c65e392491b6d299a821c4bed50e | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Fri Feb 06 19:42:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 06 19:42:38 2015 +0000 |
| tree | f9a946f3cf4675e1c2a956c50d05b145806d2fc9 | |
| parent | a5669730d0910d278fbff062c700cc43ae3c9c39 [diff] | |
| parent | 13c7044186b90f7f63e7a17996222edfb18460f5 [diff] |
am 13c70441: Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev * commit '13c7044186b90f7f63e7a17996222edfb18460f5': Revert "Expose userActivityTimeout through @SystemApi getter/setter."