| commit | cf9ef278005472fabcf05cf1309fbd295179e37c | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Jan 15 16:51:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 15 16:51:24 2015 +0000 |
| tree | 5ede8d3fb6c946fc0b5e5c2ffccc563c2ae065e2 | |
| parent | 87311d713cdacd796420c5ea70b8f48d6afaa026 [diff] | |
| parent | 5be3d9463d4fb9d320fcd27e90ba42fbfdea7e1e [diff] |
am 5be3d946: am f80dfb49: Merge "ART: Increase run-test 114 Java-level timeout" * commit '5be3d9463d4fb9d320fcd27e90ba42fbfdea7e1e': ART: Increase run-test 114 Java-level timeout