tree 9314f2fb145eef346771324280d70ec9be73a08a
parent ee409d3ab5abc34c786a5e8d087d5a9ba61f5275
author Tao Bao <tbao@google.com> 1440809180 -0700
committer The Android Automerger <android-build@android.com> 1443483006 -0700

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

Bug: 23629892
Change-Id: I7b722f1b3f43a31dc82c55127c46df6123f14b5d