| commit | 3dc5895d9f9ba6b1c23231f41a2ee2aeb9f6358a | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Mon Aug 31 23:14:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 31 23:14:44 2015 +0000 |
| tree | 6e4f56e2d20ed1064b25c14e68147ec0e1151fe6 | |
| parent | fa6f549adca29b7452b7dd3cd9eb1c429ad2d7dc [diff] | |
| parent | f86894cb9c34f32c2d6f533e1c188dc4046e602c [diff] |
am f86894cb: am a42870fc: am 188a33c7: am 7b7a3e75: am 0bafa33f: (-s ours) am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. * commit 'f86894cb9c34f32c2d6f533e1c188dc4046e602c': [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.