diff options
| author | Adam Vartanian <flooey@google.com> | 2017-07-11 09:27:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-11 09:27:32 +0000 |
| commit | 2dab5c610441ae52739b4f06366a012993220184 (patch) | |
| tree | 6582446349ae5a23f845e61f3d3860cd12a9285a /annotations/generate_annotated_java_files.py | |
| parent | 5e09ab7d618ef8ca865fd868b52ebdc0839d444f (diff) | |
| parent | a13004af80a2e757e26ea626af263b5e5cce2bd8 (diff) | |
Merge "Update tests for synced changes to Conscrypt" am: 8c7e6bd5c6 am: 603f3a3aea
am: a13004af80
Change-Id: Ie21f2ff7a14327d1037ae91387a42dde4095b182
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions