| commit | 57ad6edd886ac42d0d12858ea18c7967533d0648 | [log] [tgz] |
|---|---|---|
| author | Evan Charlton <evanc@google.com> | Fri Mar 07 01:27:33 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Mar 07 01:27:33 2014 +0000 |
| tree | ce202a12dd8bff64e2114f57c0e8628075a55947 | |
| parent | b6d118af9884895e2c8437100a3b6cad935c428c [diff] | |
| parent | 1063e2854a5904e8628894e0b5f32d46087c4639 [diff] |
Merge "Allow timeouts to be configurable" into master-nova