commit | 37fed329adec7b339755fde0b38c687f70524e4e | [log] [tgz] |
---|---|---|
author | Michael Runge <mrunge@google.com> | Thu Dec 18 01:49:06 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Dec 18 01:49:08 2014 +0000 |
tree | cae06999d3a230485086c31b02050c97e1623f37 | |
parent | 6dfc3aab025579d0472d99fc80a1a6af0703240b [diff] | |
parent | 01c06dfb076b71cb72c4bff9175bec9d59d2efde [diff] |
Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev