summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-09-01 20:12:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-01 20:12:40 +0000
commitd7da0c05aee1dba2a229232a0dbd51a27355e492 (patch)
tree3c33a58425b68749714b711ef240fa05104b5a17
parentba58503f24ebeaf3a171865713f7a69c57370867 (diff)
parent91194dd76569cd7cab044be36680c748cecbd532 (diff)
downloadlibcore-d7da0c05aee1dba2a229232a0dbd51a27355e492.zip
libcore-d7da0c05aee1dba2a229232a0dbd51a27355e492.tar.gz
libcore-d7da0c05aee1dba2a229232a0dbd51a27355e492.tar.bz2
am 91194dd7: am 25b1c4dd: am 48eaca71: am f891dc7c: am a944ebd4: am fd7ab0e2: Merge "Suppress zip & spdy tests that are OOMing with a 48MB max heap." into lmp-sprout-dev
* commit '91194dd76569cd7cab044be36680c748cecbd532':
0 files changed, 0 insertions, 0 deletions