summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorAndroid Merger <android-build-merger@google.com>2016-11-16 19:09:18 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-11-16 19:09:19 +0000
commitfcd60194c22579b0f3dcd4c88579e75dbedd830f (patch)
treee6503f05ca69278a0237021a07cbbe2c922fc918 /annotations/generate_annotated_java_files.py
parenta1203713c85e6a6cf28ab73f4ff76c8a75096892 (diff)
parent70bfafe61c0bce1722bf6762854b7b9d4a17f4fe (diff)
Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f87162 -s ours" into lollipop-mr1-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions