tree e6fed6f29746d19eef49f9c786fee4a1c63c25d6
parent db11f219bde0a0be876d5382259a42af20bb40d5
parent a08ca79ef7bacb2727db1b8feb53afe55634aa0f
author Adam Vartanian <flooey@google.com> 1510833233 +0000
committer Adam Vartanian <flooey@google.com> 1510833696 +0000

Merge upstream master

Changes the message text of a couple exceptions and fixes Wycheproof's
EcdhTest.

Bug: 68855787
Test: cts -m CtsLibcoreTestCases
Test: cts -m CtsLibcoreWycheproofConscryptTestCases
Test: cts -m CtsLibcoreOkHttpTestCases
Change-Id: I132645ba0d74d2ddb81531ffa668d2fb65d660bd