diff options
| author | Brian Carlstrom <bdc@google.com> | 2012-08-08 17:44:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-08 17:44:16 -0700 |
| commit | 969afb0daa897d40bbfa495598949b92611727a3 (patch) | |
| tree | 0e86db20023c7240276ecddbffc62843fb36650f /annotations/generate_annotated_java_files.py | |
| parent | d7d4cf700dbb7f46d5bbaccfe38f2e555b1942e8 (diff) | |
| parent | ed901b68d9feee3dc8ffadba648a120a83858333 (diff) | |
am ed901b68: am 5899d4aa: Merge "Add chain building to TrustedCertificateStore"
* commit 'ed901b68d9feee3dc8ffadba648a120a83858333':
Add chain building to TrustedCertificateStore
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions