| commit | 8d574cf703565ed46edde3ee0733926bfa853f2b | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Wed Sep 16 01:56:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 01:56:52 2015 +0000 |
| tree | 3c7fbcbb6941c483dbceb6641866c3ec36186a33 | |
| parent | 18c13ccdd62311c09c40077224392f2b5b52e679 [diff] | |
| parent | 7990c4d1a112a8b4a4f6077697124eb2d941ae84 [diff] |
am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev * commit '00db0826561b23a54db28ed5203fd7eff79c16c7': Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."