diff options
| author | Narayan Kamath <narayan@google.com> | 2015-09-01 19:59:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 19:59:33 +0000 |
| commit | 91194dd76569cd7cab044be36680c748cecbd532 (patch) | |
| tree | 4a38d981fef0682951f25a6cbb588105046dd40e /annotations/generate_annotated_java_files.py | |
| parent | e42563afca99865b8ca395ee9d40353fef48eb4d (diff) | |
| parent | 25b1c4dd5f9fbd8d6b13da9117b189e4c32d0f79 (diff) | |
am 25b1c4dd: 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 '25b1c4dd5f9fbd8d6b13da9117b189e4c32d0f79':
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions