| commit | 0098cbc011771d5ffdf93a3a4b7e6a0507e1725d | [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 | f7fd18e2fcc8d0fa62c0f5cbfa2880cb86675b5d | |
| parent | 7198c0aa4ccbeaecf2606006d3a6ace684f805fe [diff] | |
| parent | 971ff47c75889a2fc4ac710fbe62ba819feeaba6 [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."