tree 84efba0b962ec65d27cc52084f8b76d1be45ed7e
parent e268c1fff19ab092bf3d5dd2e6348bea5b0f1b42
parent f69c37dd3433b6a32d5bf703a6ad98b0c3a853fc
author Zach Jang <zachjang@google.com> 1442372669 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442372669 +0000

am f69c37dd: (-s ours) am ea196888: am e1ab0999: am 2b564bf4: am 716c6269: am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev

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