diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:53:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:53:02 +0000 |
| commit | f8ef9e2c9c86aab687dccfbf6ca45560dfd2065d (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | b5edbceff52f74ae573afbc4a7b11707e3d48757 (diff) | |
| parent | a70b26984c33ec6e2079a5a0f2d553b3c890a30e (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
Change-Id: I1525076aeaa5e2d4031c074b0e82593bfdc06734
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions