tree 5df9cccd0fbe973445839e373b0bb0a2b5ba45a9
parent 95e39c4b931745cdaa25931d814c2148bc07ab6e
parent 6e378e8b9a97b71ab126925c9f9f68eb847a67cf
author Paul Duffin <paulduffin@google.com> 1544194311 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1544194311 +0000

Merge changes Iacae1087,If52f1014

* changes:
  Test Android specific SSLServerSocketFactory.getDefault() behavior
  Update the API signature files to include annotation methods