diff options
| author | Narayan Kamath <narayan@google.com> | 2015-09-01 09:14:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 09:14:32 +0000 |
| commit | a944ebd45224439731be35c6a16af526570ed78a (patch) | |
| tree | 0cccb55e12aa574e864a4918a796a3b909453ed5 /annotations/generate_annotated_java_files.py | |
| parent | bfef9b5cf4dc6f94e5dd3cc8c7328d2365dc1dab (diff) | |
| parent | fd7ab0e2f9626ca5233eea7373e99e3fbd4e83f1 (diff) | |
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.
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions