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