tree d1f2a746231675957ea4b35f4bb5e669baf805f3
parent f4736a7ead342f7b456c0e0e7efd9d2a2ffe50cf
author Zach Jang <zachjang@google.com> 1442347792 +0000
committer The Android Automerger <android-build@android.com> 1442428659 -0700

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

This reverts commit 82b70db7dd906013d131737a5bec2ae59b41ae61.

Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f