diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:09:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:09:28 +0000 |
| commit | 094e5227a5c9584756e1003d8b4548b1abcbd7ae (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | 0a0719ee7a9418052c438f27d21bc0503c22ca29 (diff) | |
| parent | db1076a48392e4d64623a47b8fbed817c804a8b8 (diff) | |
Merge "DO NOT MERGE IDN: Fix handling of long domain names." into marshmallow-cts-dev am: 21ea90da73 -s ours
am: db1076a483
Change-Id: I3e2a8a9822623fc59cc458dd5f84109a63e20e1e
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions