| commit | c4c076b69de82782a092c55de8c698c47e786051 | [log] [tgz] |
|---|---|---|
| author | Roland Levillain <rpl@google.com> | Tue Feb 23 13:58:13 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 23 13:58:13 2016 +0000 |
| tree | 8f01daf6d9771576dbacc29323accfa63f6a2b63 | |
| parent | b37208527ffdc61ae295e6f2dc2987fabd8748c1 [diff] | |
| parent | a016ba5614054e27eada7f4815df7d4bac7ba8d8 [diff] |
Merge "Re-enable tests that were causing TimeoutExceptions on x86/x86-64." am: a016ba5614 * commit 'a016ba5614054e27eada7f4815df7d4bac7ba8d8': Re-enable tests that were causing TimeoutExceptions on x86/x86-64.