| commit | e268c1fff19ab092bf3d5dd2e6348bea5b0f1b42 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Wed Sep 16 03:04:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 03:04:22 2015 +0000 |
| tree | 84efba0b962ec65d27cc52084f8b76d1be45ed7e | |
| parent | 63165f24f0bee1da373c7d7a8d7644451ea65fc9 [diff] | |
| parent | 592e874428920b5cc505952b988ae6fa6e977592 [diff] |
am 592e8744: (-s ours) 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 '592e874428920b5cc505952b988ae6fa6e977592': Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."