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