diff options
| author | Adam Vartanian <flooey@google.com> | 2017-05-26 13:22:07 +0100 |
|---|---|---|
| committer | Adam Vartanian <flooey@google.com> | 2017-06-02 08:44:47 +0100 |
| commit | d7d29a2237c9e3cca502c070fe73b2a2c937fca7 (patch) | |
| tree | 64d778c76dc7c71997e919bbb4a6e7a84ec79604 /include/ScopedJavaUnicodeString.h | |
| parent | ecca2c7e42a24fe951901fafe1621a53f3cbde82 (diff) | |
Update SSL{,Server}SocketFactory Android-changed markers.
Also eliminates a number of unneccesary diffs from upstream.
Bug: 38192317
Test: cts -m CtsLibcoreTestCases
Change-Id: I4097c7947180384e9e8a7f515a701f0297f4e8b6
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions