| commit | 592e874428920b5cc505952b988ae6fa6e977592 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Wed Sep 16 02:45:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 02:45:31 2015 +0000 |
| tree | d292b92f8d601370d676032e67ebe2b51a2a4af7 | |
| parent | ff6f0769790d85b352d72e10e12ec51fba5892dc [diff] | |
| parent | d00737fc72037d5af035108ef532edbc770c5039 [diff] |
am d00737fc: am eee9c2de: 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 'd00737fc72037d5af035108ef532edbc770c5039': Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."