summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorTina Zhou <tinazh@google.com>2016-11-16 20:04:51 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-11-16 20:04:51 +0000
commit71dc66cdea1a52cd9a9498a8351a5c0df2b94dfc (patch)
treec7e78a7b03990a7a21325a959a06bbfe4a1c1ed6 /annotations/generate_annotated_java_files.py
parent21a093319e27e9286520e8b629c1449b50406ff6 (diff)
parent74a8b3c1e94609c73ce6c2ffa347c01877fcfa46 (diff)
Merge "Merge "CertificateTest: explicitly set validity check date" into lollipop-mr1-cts-dev am: 348c01550a" into marshmallow-cts-dev am: 6bb2a718c6 am: e804e3897d am: da01bba430
am: 74a8b3c1e9 Change-Id: I974ab261921693fc2138a05237632115a2fde427
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions