diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:17:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:17:01 +0000 |
| commit | f52b0572562c897f6cd7f66f10955d50ddf58f8d (patch) | |
| tree | 3670478a4ffbad48469ff0a538eb7fb7913bb3b2 /annotations/generate_annotated_java_files.py | |
| parent | 548cad532e28479aa5fe267b0a51871625a02f25 (diff) | |
| parent | df85514873da8cd635b660e986527259397fd884 (diff) | |
Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff74 -s ours
am: df85514873 -s ours
Change-Id: I3e2acd6f83304fb21b1515559cddda5b9553b23b
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions