diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-10-05 14:40:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-05 14:40:42 -0700 |
| commit | 7b4e6828e66d6e13a105ac29427e0d231ba2e6f5 (patch) | |
| tree | ca577db6e65846a2edd25d6010aeb3c236a02f23 /annotations/generate_annotated_java_files.py | |
| parent | 7d38fa0f3db07f3771584725c77c30c6e36bf953 (diff) | |
| parent | 735f93475d1d54ad7b2d1c2376adc0fcf4d4c7a1 (diff) | |
Merge "Favor Harmony's CertificateFactory.X509 over BouncyCastle's" into gingerbread
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions