diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 20:12:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 20:12:39 +0000 |
| commit | 828c2b07296251993308519c541c55b801f8fbf7 (patch) | |
| tree | b5c1d8772d3f36a01fe5cd29ffe58338115080fd /annotations/generate_annotated_java_files.py | |
| parent | 0f82b34f23ccce9d1e0b3395aaf7346e84b31bd1 (diff) | |
| parent | 71dc66cdea1a52cd9a9498a8351a5c0df2b94dfc (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
am: 71dc66cdea
Change-Id: I125f1d10216da7aad888ae6574ade654057e7e68
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions