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