diff options
author | Android Merger <android-build-merger@google.com> | 2016-11-16 18:54:25 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-11-16 18:54:26 +0000 |
commit | bbec80932ce8767b765026ed086ea084c33f3c2f (patch) | |
tree | 3670478a4ffbad48469ff0a538eb7fb7913bb3b2 /annotations/generate_annotated_java_files.py | |
parent | eda7bce284353e0822d0d8c1a5839106b442f97f (diff) | |
parent | b146258bcdc8c798826aa20f9d210651916a6347 (diff) |
Merge "Merge "IDN: Fix handling of long domain names." into lollipop-mr1-cts-dev am: a0b160e5f3" into marshmallow-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions