OSDN Git Service

[automerger skipped] Merge "Fix socket leaks in various android.net.Network methods...
authorPaul Jensen <pauljensen@google.com>
Fri, 30 Mar 2018 22:17:07 +0000 (22:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Mar 2018 22:17:07 +0000 (22:17 +0000)
commit7ab5942838f0b826a915ed2adbc9c924c4db72bf
tree1a5cdfcf778f7ea8295c39a72dccf094851f422d
parent48934218ddb97dee7b53e3771bc8d64430fcd63c
parentf6ab9a5f9641ca628443de1212e1341a5ff68e20
[automerger skipped] Merge "Fix socket leaks in various android.net.Network methods." am: 34ce11f2bd
am: f6ab9a5f96  -s ours

Change-Id: I6da127bed317ba1faf995ebb0236d91774782acb