tree fd0c669439a8b519092c08bdf0962f7ee2526ee5
parent 774adb03a30e0203bf2f4da29907d463799c33c3
parent 0098cbc011771d5ffdf93a3a4b7e6a0507e1725d
author Zach Jang <zachjang@google.com> 1442370328 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442370328 +0000

am 0098cbc0: am 971ff47c: am 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev

* commit '0098cbc011771d5ffdf93a3a4b7e6a0507e1725d':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."