summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorTina Zhou <tinazh@google.com>2016-11-16 19:17:14 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-11-16 19:17:14 +0000
commite13041fe76e0a014c5802aa8d857e8fb3d77bd34 (patch)
treedaafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py
parentf0c45df8163dbe93c3f16b94a2bdbb1f6c54e34e (diff)
parent7ddff7833267a7d16c423fc29eb6d002706e827c (diff)
Merge "IDN: Fix handling of long domain names." into lollipop-mr1-cts-dev am: a0b160e5f3 am: b146258bcd am: 166b2e84f8
am: 7ddff78332 Change-Id: Ia17fd1153653db1005209715fcf40c68d423dbab
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions