| commit | 7b5f9cde6ac6d949d0227eb47aa2c5de4aea71d9 | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Fri Feb 06 19:09:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 06 19:09:28 2015 +0000 |
| tree | 63480927c37d495a968404204084d6f1b508fc73 | |
| parent | c63efbd928cc14e32fe19b2dec41d15ffc584182 [diff] | |
| parent | 4cccd58e4219ff1e974db201e064c85063dd262f [diff] |
am 4cccd58e: Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev * commit '4cccd58e4219ff1e974db201e064c85063dd262f': Expose userActivityTimeout through @SystemApi getter/setter.