diff options
| author | Android Merger <android-build-merger@google.com> | 2016-11-16 19:16:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-11-16 19:16:50 +0000 |
| commit | bb1f9a08da6a15579703de27c9c6dc8bc4696c46 (patch) | |
| tree | 3670478a4ffbad48469ff0a538eb7fb7913bb3b2 /annotations/generate_annotated_java_files.py | |
| parent | f7b941eac65b09c747f16fdcdb60a15e65a1b614 (diff) | |
| parent | 72929bf47603a713bd3a5ae901f7f12833c8264f (diff) | |
Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f87162 -s ours am: 70bfafe61c -s ours" into marshmallow-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions