summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2010-10-13 11:19:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-13 11:19:08 -0700
commit0dc949645456739af3cbb8e3bc6221798abb00c5 (patch)
tree148cb647963ddf0f6b0bfc02a492d0dc263af84c /annotations/generate_annotated_java_files.py
parent058c07643f09975c4361634984babbbf6e5bd157 (diff)
parentd6e53e42867824f97c9fb9c427cc188897ea9315 (diff)
am d6e53e42: SSLParameters.getDefaultTrustManager() should lazily initialize its value
Merge commit 'd6e53e42867824f97c9fb9c427cc188897ea9315' into gingerbread-plus-aosp * commit 'd6e53e42867824f97c9fb9c427cc188897ea9315': SSLParameters.getDefaultTrustManager() should lazily initialize its value
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions