OSDN Git Service

Merge "DO NOT MERGE Fix issue #24118803: The screen doesn\'t turn off..." into mnc...
authorDianne Hackborn <hackbod@google.com>
Fri, 23 Oct 2015 17:09:45 +0000 (17:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Oct 2015 17:09:45 +0000 (17:09 +0000)
commit9161871f8374a3d3ec184dd1c716d117e06381c6
treebdd49c94b709b9bfb37ba18cd1a8e1e710ccde8c
parentaf745653d0809d7f9545cebf8727ea8c75990fd1
parentb32e020d237cfd94cdfe8c589900a899dc14413a
Merge "DO NOT MERGE Fix issue #24118803: The screen doesn\'t turn off..." into mnc-dr-dev
am: b32e020d23

* commit 'b32e020d237cfd94cdfe8c589900a899dc14413a':
  DO NOT MERGE Fix issue #24118803: The screen doesn't turn off...
services/core/java/com/android/server/DeviceIdleController.java