summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2011-01-20 17:01:07 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-20 17:01:07 -0800
commit3859fc50f295362530cb68a9d88c66fe86d32726 (patch)
tree9d9559285e2c6151e3ed1034096ff59afa8c2cd7 /annotations/generate_annotated_java_files.py
parent0af273100d1ad85ec938b2e0cd1f7696fd0721ee (diff)
parentcbb8e665860bb718c92a89c255d5e662cb15a269 (diff)
am cbb8e665: Merge "CA certificate update" into honeycomb
* commit 'cbb8e665860bb718c92a89c255d5e662cb15a269': CA certificate update
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions