Craig Mautner c8d97850a8 am a673263d: am 0a398d7b: Merge "Treat screen-on while pausing as pause timeout." into lmp-mr1-dev ...

* commit 'a673263d059997f846fa1765776758c6d06e5131':
  Treat screen-on while pausing as pause timeout.

2014-11-21 23:07:14 +00:00

..

java/com/android/server

am a673263d: am 0a398d7b: Merge "Treat screen-on while pausing as pause timeout." into lmp-mr1-dev

2014-11-21 23:07:14 +00:00

jni

resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp

2014-11-12 13:24:42 -08:00

Android.mk

…