tree 0137a9cce7252dbb88a5be52acc3b4d76b011fac
parent 82b70db7dd906013d131737a5bec2ae59b41ae61
author Zach Jang <zachjang@google.com> 1442347792 +0000
committer Zach Jang <zachjang@google.com> 1442347792 +0000

Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."

This reverts commit 82b70db7dd906013d131737a5bec2ae59b41ae61.

Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f