| commit | 3c04eb6e8e7f2763e54d4c856bb339c017d5e71f | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Fri Jan 16 06:07:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 16 06:07:38 2015 +0000 |
| tree | 9037aad9a8c411da5e15462dfd019f19a821069a | |
| parent | 1a410ed18e4a54f8f4cbb0d0c2795ec37c79f160 [diff] | |
| parent | 698581b1cdde48e117ca12c54d42ecf223596264 [diff] |
am 698581b1: am 3e384652: Merge "Increase default timeout" * commit '698581b1cdde48e117ca12c54d42ecf223596264': Increase default timeout