diff options
author | vichang <vichang@google.com> | 2017-09-14 10:30:55 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-14 10:30:55 +0000 |
commit | 8544961ca214d7655099b45b9380f740a69cebd1 (patch) | |
tree | 4a005ef72a41bdd9ab1821484fcc4f52dad4867d /annotations/generate_annotated_java_files.py | |
parent | 2800ab6d8dabdc30d5be99c12b2518b22f532aa9 (diff) | |
parent | 8ef423ca0e43afa10f169bbd5df9004ada5daa74 (diff) |
Merge changes I0308ddf9,I3227c00e,I76ba1af4,Id27c561a
* changes:
8u121-b13 integration for java.net - Document Android changes
Integrate upstream changes forgotten in the update to OpenJDK 8u121-b13
Remove unncessary hostname assignment in Inet6Address.initif
Remove DatagramSocket.setNetworkInterface
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions