| commit | 404a1327e9408cc36c6ca4b6e03ee2edd8286e87 | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Fri Feb 06 19:45:54 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 06 19:45:54 2015 +0000 |
| tree | 1f98340a929515b151aa7f92437be263a9a665dd | |
| parent | 6531290d5428370cd504b2cc29073afbe848b41f [diff] | |
| parent | a20e430d0ab8c65e392491b6d299a821c4bed50e [diff] |
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."