diff options
| author | Adam Vartanian <flooey@google.com> | 2017-11-16 11:35:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-16 11:35:46 +0000 |
| commit | 25ea5d7452efe083740bb49e4b8b2c1b47957824 (patch) | |
| tree | 14cc896a45fb747aed84c2f4fe2aaa40e3861870 /annotations/generate_annotated_java_files.py | |
| parent | 1babe2e52382a74f50048c0fb0fa294710f638e7 (diff) | |
| parent | 1d1bd2ab71c847609e97016000ccafa3043f7b98 (diff) | |
Merge "Update tests for Conscrypt upstream merge."
am: 1d1bd2ab71
Change-Id: I07ca5a89b569828b9e3b99acb6fe27ba759d6b11
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions