OSDN Git Service

Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
authorZach Jang <zachjang@google.com>
Tue, 15 Sep 2015 20:09:52 +0000 (20:09 +0000)
committerThe Android Automerger <android-build@google.com>
Thu, 22 Oct 2015 18:27:56 +0000 (11:27 -0700)
commit3169f4cd87c5558c3ea60b0ef78f5f4e03ca94a2
treed0774a81b3b080d5a579a61dddfb3970809974ba
parenta6b483722df09654cee1dc1de80a441b739c32aa
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."

This reverts commit 82b70db7dd906013d131737a5bec2ae59b41ae61.

Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f
services/core/java/com/android/server/power/PowerManagerService.java