| commit | 4cccd58e4219ff1e974db201e064c85063dd262f | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Fri Feb 06 19:05:20 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Feb 06 19:05:22 2015 +0000 |
| tree | 94f17060e10c0e8459a83f2f836144b423f03a7e | |
| parent | 022cf57f82e40a103c4a48c083a59d7fa4936668 [diff] | |
| parent | 40a0ee65f269cffa7d3fb0646bd987a69df5c2d0 [diff] |
Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev