diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-10-21 15:40:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 15:40:23 -0700 |
| commit | 1439a25b9eea8a21dc439ff97c279ba484273f91 (patch) | |
| tree | a278de7cb6abac9e992a2c11695118157f63d4e5 /annotations/generate_annotated_java_files.py | |
| parent | c3c555bcce296baf2d0d557890bc500fbb5cf23b (diff) | |
| parent | 58972ff81a06cea8080149845a37f65bac92315d (diff) | |
am 58972ff8: Merge "Restore md2WithRSAEncryption version of Version Class 3 CA" into gingerbread
Merge commit '58972ff81a06cea8080149845a37f65bac92315d' into gingerbread-plus-aosp
* commit '58972ff81a06cea8080149845a37f65bac92315d':
Restore md2WithRSAEncryption version of Version Class 3 CA
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions