tree 48d6825c10aeac7681bc815433d6cc65019ab6e8
parent fbd58cf4deee8ce91873f25f30104dc051952f90
parent 82055a89a0f9e2eca61e91b4732933dd9d2a4a36
author Narayan Kamath <narayan@google.com> 1416928093 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416928093 +0000

am 82055a89: Revert "Suppress zip & spdy tests that are OOMing with a 48MB max heap."

* commit '82055a89a0f9e2eca61e91b4732933dd9d2a4a36':
  Revert "Suppress zip & spdy tests that are OOMing with a 48MB max heap."