OSDN Git Service

am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
authorTao Bao <tbao@google.com>
Mon, 31 Aug 2015 22:19:58 +0000 (22:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 31 Aug 2015 22:19:58 +0000 (22:19 +0000)
commit0bafa33fcdebeaf6bdfd36a3f75e461d630b86bc
tree03765be6514332a106cdbf3c16faf9dca7108a97
parent9f37bd8a5d61b2fa05af1b259ec0461673434ec8
parent35c1eb9e6506b407a1af40359d48bb06d884385d
am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.

* commit '35c1eb9e6506b407a1af40359d48bb06d884385d':
  [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
services/core/java/com/android/server/power/PowerManagerService.java