summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorGrigory Dzhavadyan <grigoryj@google.com>2016-03-15 02:15:20 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-03-15 02:15:20 +0000
commitb55e932c79b22a7a79bb7fa77193630f5c03d33e (patch)
treef53d512f3f8f5909007791a47e6cf935a950e500 /annotations/generate_annotated_java_files.py
parent6c0345ea21775f6a9da186f5286bb61816b30a27 (diff)
parent078084734420e36afaf80f09d3987a6fb1a557a5 (diff)
Merge "Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs" into marshmallow-cts-dev
am: 0780847344 * commit '078084734420e36afaf80f09d3987a6fb1a557a5': Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions