summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2017-02-17 22:44:09 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-17 22:44:09 +0000
commite9650b7240904fa65e92ce14a49a6c61bc96901f (patch)
tree3ff456531fb37a7606938f9feb84db2c8f113c0b /annotations/generate_annotated_java_files.py
parent7e6977749c9b054f91fb216c9dc42d604119483c (diff)
parent31635f7fc529e52ba8b40698768c7ac69613151b (diff)
Merge mirror-aosp-marshmallow-cts-dev revision 016c30e83ec00454f07c5def94682f820c54fb59 into mnc-dev. am: 120f270103 am: b7465ab17a am: 779a7f07c7
am: 31635f7fc5 Change-Id: Ib9e448f5e33424a58ed3001877f4a0824ce4bb5c
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions