OSDN Git Service

am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout...
authorZach Jang <zachjang@google.com>
Wed, 16 Sep 2015 01:56:57 +0000 (01:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Sep 2015 01:56:57 +0000 (01:56 +0000)
* commit '11317e82cf561597bbd4e2dbf5840854e6b7a16d':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""

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