summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2012-10-05 14:38:20 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-05 14:38:20 -0700
commite51202d94f55e6659dd39a7976ded526297276ee (patch)
tree23e9d40f1390f66cccfb4822a4e848d7af147785 /annotations/generate_annotated_java_files.py
parentb11e44a402eb0f9c5da1f7482fc1eabdd9adff47 (diff)
parent50e50d57783060196a1f8e367616f2109c9edb4e (diff)
Merge "Ensure we give "tl" the display name "Filipino"." into jb-mr1-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions