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