diff options
| author | Narayan Kamath <narayan@google.com> | 2015-09-01 09:55:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 09:55:05 +0000 |
| commit | f891dc7cc3d5f1ca213b132fdf9c05c10a54cd4c (patch) | |
| tree | 91c8c399ba9f3250e2ca45b3ed68d31c52bc05c4 /annotations/generate_annotated_java_files.py | |
| parent | db745b0d0384a11b7f0c472e574fac5e80cb65b5 (diff) | |
| parent | a944ebd45224439731be35c6a16af526570ed78a (diff) | |
am a944ebd4: am fd7ab0e2: Merge "Suppress zip & spdy tests that are OOMing with a 48MB max heap." into lmp-sprout-dev
* commit 'a944ebd45224439731be35c6a16af526570ed78a':
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions