Bryce Lee 9cd324d158 am 4cccd58e: Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev ...

automerge: 7b5f9cd

* commit '7b5f9cde6ac6d949d0227eb47aa2c5de4aea71d9':
  Expose userActivityTimeout through @SystemApi getter/setter.

2015-02-06 19:11:36 +00:00

..

android

am 4cccd58e: Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev

2015-02-06 19:11:36 +00:00

com

First quick implementation of auto assist data.

2015-02-06 10:42:44 -08:00

jarjar-rules.txt

…

overview.html

…