| commit | 698581b1cdde48e117ca12c54d42ecf223596264 | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Fri Jan 16 02:40:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 16 02:40:56 2015 +0000 |
| tree | dcfc7b8dddad2fb58a170efa71d8c291350ee497 | |
| parent | 1f0ef91eafed4fa6f5076a8ffb626a5ba4a375af [diff] | |
| parent | 3e384652fe16127ce4c9c25d4fa44ce1c5a9dc9f [diff] |
am 3e384652: Merge "Increase default timeout" * commit '3e384652fe16127ce4c9c25d4fa44ce1c5a9dc9f': Increase default timeout