diff options
| author | Kenny Root <kroot@google.com> | 2012-08-29 12:06:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-29 12:06:11 -0700 |
| commit | 89e98b1f185dc25ffc1ecf77e9e96d8d0c2604e6 (patch) | |
| tree | 8f54a3b9ddcb8122e15978c1775a4e2da84fd4ac /annotations/generate_annotated_java_files.py | |
| parent | 4cf204e549692f17e3974cef7c5854157df4ca3a (diff) | |
| parent | a8ae31b76c5615bf025b29e96dcadf900164efed (diff) | |
Merge "Add Android KeyStore provider to StandardNames" into jb-mr1-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions