| commit | 188a33c7acb53fb59364b82a41ec9270f6aef5cf | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Mon Aug 31 22:45:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 31 22:45:15 2015 +0000 |
| tree | 8bf4bc6a493ef3b5872bd3ee44e02c2d6867e9d6 | |
| parent | 7878eee8a9c20752e038f563b98b6b42c372cd0f [diff] | |
| parent | 7b7a3e75c3a107c139a7832c5a04cc0d01b7cd1f [diff] |
am 7b7a3e75: am 0bafa33f: (-s ours) am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. * commit '7b7a3e75c3a107c139a7832c5a04cc0d01b7cd1f': [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.