summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorAndroid Merger <android-build-merger@google.com>2016-11-16 19:39:36 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-11-16 19:39:37 +0000
commit5f6845c645752f0de5d052218b112596fbceb417 (patch)
tree06a5a1af73fd0ae39e01f03041c37b8109ebae79 /annotations/generate_annotated_java_files.py
parent3524824ca20b3176e8b61393dab58e00505ea218 (diff)
parentfd432b70d4f5d9aac97239e0fff7933932dac2c3 (diff)
Merge "Merge "Merge "CertificateTest: explicitly set validity check date" into lollipop-mr1-cts-dev am: 348c01550a" into marshmallow-cts-dev am: 6bb2a718c6" into nougat-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions