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