| commit | 5be3d9463d4fb9d320fcd27e90ba42fbfdea7e1e | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Jan 15 16:43:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 15 16:43:29 2015 +0000 |
| tree | d373ebb121fca4c1506340d4e11cc36d1d5801ec | |
| parent | 62379f09aec1d14e0e0d9da9415931a0e332b0b4 [diff] | |
| parent | f80dfb498451dc59e8f3375e6cf617055d3e76d1 [diff] |
am f80dfb49: Merge "ART: Increase run-test 114 Java-level timeout" * commit 'f80dfb498451dc59e8f3375e6cf617055d3e76d1': ART: Increase run-test 114 Java-level timeout