summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorTina Zhou <tinazh@google.com>2016-11-16 19:56:58 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-11-16 19:56:58 +0000
commit74a8b3c1e94609c73ce6c2ffa347c01877fcfa46 (patch)
treec7e78a7b03990a7a21325a959a06bbfe4a1c1ed6 /annotations/generate_annotated_java_files.py
parentf7d549c5611626df4f37137f39494659ca2e2a6e (diff)
parentda01bba43078af28b2c66502d635ef84be3207d1 (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 Change-Id: I3b18b6a3d17047174b540aa59c24f0dbadf79918
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions