tree 7414a81eab69835543e4964ce13fb3fdc22b536c
parent 80a166b4cbdf3ea41e0e35db21208a8e5df78993
parent 15e853493f013a5397288088c20354e2bd436a5a
author Narayan Kamath <narayan@google.com> 1416832051 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1416832052 +0000

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