| commit | 259a356df6766a6d079f4ab09d607e684edd5d3f | [log] [tgz] |
|---|---|---|
| author | Kristian Monsen <kristianm@google.com> | Tue Mar 05 22:31:21 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 05 22:31:21 2013 +0000 |
| tree | 3ea573a020544ce9d7e3446a96e4a8531ed01aae | |
| parent | 6588d28ed37af3684fd7dbf8afc1c97273024771 [diff] | |
| parent | 3e91a6d189992293d78799a8f0fd4482a05a4820 [diff] |
Merge "Increasing the timeout to see if that makes the test not flaky on the bot" into jb-mr2-dev