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