diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-10-05 14:43:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-05 14:43:35 -0700 |
| commit | fc15fc0f9902bdecd1c535e6e06ea52669695fce (patch) | |
| tree | ca577db6e65846a2edd25d6010aeb3c236a02f23 /annotations/generate_annotated_java_files.py | |
| parent | 1d2861f436ccf4017c45ee3be2fce8dcd0d6859b (diff) | |
| parent | 7b4e6828e66d6e13a105ac29427e0d231ba2e6f5 (diff) | |
am 7b4e6828: Merge "Favor Harmony\'s CertificateFactory.X509 over BouncyCastle\'s" into gingerbread
Merge commit '7b4e6828e66d6e13a105ac29427e0d231ba2e6f5' into gingerbread-plus-aosp
* commit '7b4e6828e66d6e13a105ac29427e0d231ba2e6f5':
Favor Harmony's CertificateFactory.X509 over BouncyCastle's
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions