tree 1f98340a929515b151aa7f92437be263a9a665dd
parent 6531290d5428370cd504b2cc29073afbe848b41f
parent a20e430d0ab8c65e392491b6d299a821c4bed50e
author Bryce Lee <brycelee@google.com> 1423251954 +0000
committer android-build-merger <android-build-merger@google.com> 1423251954 +0000

am 13c70441: Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev
automerge: a20e430

* commit 'a20e430d0ab8c65e392491b6d299a821c4bed50e':
  Revert "Expose userActivityTimeout through @SystemApi getter/setter."