diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:53:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:53:38 +0000 |
| commit | b6bb3dfc52e17bd464e1f530db64a27b3b4cbfb5 (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | 32d73dada730f0cfff45d4ded7fbcc8176b7120a (diff) | |
| parent | fd69f64932d779fd08447d0724274025eeb9acbb (diff) | |
Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff74 -s ours" into lollipop-mr1-cts-dev am: a1b430d841 -s ours am: 2b20489d39 -s ours am: 94ac2d84d8
am: fd69f64932
Change-Id: I7b7cb5cd8368f77b452a138ab5388650db805a2c
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions