| commit | 971ff47c75889a2fc4ac710fbe62ba819feeaba6 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Wed Sep 16 02:06:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 02:06:26 2015 +0000 |
| tree | fc66900111f3cb4bb6bfdff9f86734e92fe3c8e4 | |
| parent | cd946024e94a8fe2f4009dbd2e5463817a17b3a9 [diff] | |
| parent | 1b06455e44395489dcd027a170e68eabf2ebe1da [diff] |
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 '1b06455e44395489dcd027a170e68eabf2ebe1da': Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."