diff options
author | Tina Zhou <tinazh@google.com> | 2016-11-16 20:00:40 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 20:00:40 +0000 |
commit | e732a0f6d07740bf55d94b19c2d581a999bee59c (patch) | |
tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
parent | 5802c763025925f9f5c5bbd12c3721160e6305cd (diff) | |
parent | f8ef9e2c9c86aab687dccfbf6ca45560dfd2065d (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 am: a5d8ba2b2d am: a70b26984c
am: f8ef9e2c9c
Change-Id: I316220639ad3051b4ccc336cf80e7593c06df5c6
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions