| commit | 9e459903b894f79ba3b21925ba022167308bd140 | [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 | 997e7486b67e0cca770930c4501eeda27c58ef73 | |
| parent | efe8307df19eef5285cca0f5213f4dfbc1a661b6 [diff] | |
| parent | 8d574cf703565ed46edde3ee0733926bfa853f2b [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."