OSDN Git Service

am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncry...
authorZach Jang <zachjang@google.com>
Wed, 16 Sep 2015 01:56:52 +0000 (01:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Sep 2015 01:56:52 +0000 (01:56 +0000)
* commit '00db0826561b23a54db28ed5203fd7eff79c16c7':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."

1  2 
services/core/java/com/android/server/power/PowerManagerService.java