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