| commit | 1049ba8a572f4d0fb06a1c8ec6d81758d0ee7e77 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Wed Sep 16 02:16:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 02:16:00 2015 +0000 |
| tree | 36e59a48ce3dffa16c0541209104ce6e1b2449fe | |
| parent | 750310ff7b32a4e52090064d944bf0f5f6221212 [diff] | |
| parent | 9e459903b894f79ba3b21925ba022167308bd140 [diff] |
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 '971ff47c75889a2fc4ac710fbe62ba819feeaba6': Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."