diff options
| author | Adam Vartanian <flooey@google.com> | 2017-05-05 08:25:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-05 08:25:12 +0000 |
| commit | 6a4be5edc30b2253416fc4acb644bae7d91e5308 (patch) | |
| tree | 47a4d3412744ac780fc993ee68dd638246d55a5d /annotations/generate_annotated_java_files.py | |
| parent | a7fa284c9bd0acb952409a17453e8d0d4c1948a5 (diff) | |
| parent | 3972057d2785ece216a164c18cd5c7736851a356 (diff) | |
Merge "Add test that Conscrypt always overrides Bouncy Castle." into oc-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions