commit | 8deabad541984571496456646d6a7a91eccc9e42 | [log] [tgz] |
---|---|---|
author | Michael Runge <mrunge@google.com> | Thu Dec 18 01:53:26 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 18 01:53:26 2014 +0000 |
tree | 9f1b284777e5b82bdf5407371704512c2fa004a8 | |
parent | bdc1a3d03a8dee874e782dc9e2423571cce70406 [diff] | |
parent | 37fed329adec7b339755fde0b38c687f70524e4e [diff] |
am 37fed329: Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev * commit '37fed329adec7b339755fde0b38c687f70524e4e': Increase timeout when uncrypting OTA