tree 6d16142304003d64521372fcc0eb8faebc393f40
parent 44b5a1c8471ef5e1cd3dcfffec5a9e439f228766
parent b019703395ae0304ddd10054843c64db87229d23
author Michael Runge <mrunge@google.com> 1427342253 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427342253 +0000

am b0197033: Increase timeout when uncrypting OTA

* commit 'b019703395ae0304ddd10054843c64db87229d23':
  Increase timeout when uncrypting OTA