| commit | 1b06455e44395489dcd027a170e68eabf2ebe1da | [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 | bd0e0497b56d32447b5fb69d499893460874332d | |
| parent | 1c88f605629a5f1647a8af1fdcfe0fb6e3eea847 [diff] | |
| parent | 00db0826561b23a54db28ed5203fd7eff79c16c7 [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."