| commit | 9cd324d158083bf388783afe471f30b255a30fae | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Fri Feb 06 19:11:36 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 06 19:11:36 2015 +0000 |
| tree | 5387a47c0cbe3fc734ee6f1edbdc6f62f3dd2d53 | |
| parent | a1c14fe945c00c55d4966aca943b2de8f4535a27 [diff] | |
| parent | 7b5f9cde6ac6d949d0227eb47aa2c5de4aea71d9 [diff] |
am 4cccd58e: Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev automerge: 7b5f9cd * commit '7b5f9cde6ac6d949d0227eb47aa2c5de4aea71d9': Expose userActivityTimeout through @SystemApi getter/setter.