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