am cbc04230: Merge "Fix a sorting bug in SSLSocket javadoc."

* commit 'cbc04230ba06e4c8877ce34b0fa659a014b5578c':
  Fix a sorting bug in SSLSocket javadoc.