tree 77bd59e2ce7d5666eb8cecbf14ff553530322420
parent fc91c292a8cc5aaba60470f3057bc915e713109d
parent fd7ab0e2f9626ca5233eea7373e99e3fbd4e83f1
author Narayan Kamath <narayan@google.com> 1416832316 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416832316 +0000

am fd7ab0e2: Merge "Suppress zip & spdy tests that are OOMing with a 48MB max heap." into lmp-sprout-dev

* commit 'fd7ab0e2f9626ca5233eea7373e99e3fbd4e83f1':
  Suppress zip & spdy tests that are OOMing with a 48MB max heap.