summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorAndroid Merger <noreply-android-build-merger@google.com>2018-01-11 15:31:41 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-01-11 15:31:41 +0000
commit871dbcef9f53ca5ea39c291c323dd22aaf5c7731 (patch)
tree5e07d781167a958992fc61ee713753a91da70d06 /annotations/generate_annotated_java_files.py
parent703d4e200c715cc18182c5ee5293cf15fe8e4776 (diff)
parent37922cfdabafee8915484fabbbb1c812cb589d5e (diff)
Merge "Merge "Merge "Do not run test requiring 3GB free space on devices that do not have it" into nougat-cts-dev am: 65e0e6e225" into nougat-mr1-cts-dev am: fb7d3730fa" into oreo-cts-dev
am: 37922cfdab Change-Id: I6e1e86d129857756ab2490b5005c632f9c2f6076
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions