| commit | b7f548495f60fcde52db11edcb9327636cc2c65a | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Fri Jul 25 23:54:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 25 23:54:44 2014 +0000 |
| tree | cd6830f2e364d17505d2a59fbbed00f34fd3bc88 | |
| parent | 1166458bdc50aaca5f52051631750e3adfd07b79 [diff] | |
| parent | 0cadcc4b53f260e4e0e2a2ef0c8f4e668a9c1a18 [diff] |
am 0cadcc4b: am 3bcac48f: Merge "ART: Fix run-test 114 ParallelGC to account for OOM" * commit '0cadcc4b53f260e4e0e2a2ef0c8f4e668a9c1a18': ART: Fix run-test 114 ParallelGC to account for OOM