OSDN Git Service

Merge "Replace TcpSocketInfo with similar structure" am: a34aa2acab am: 43411c851d
authorMark Chien <markchien@google.com>
Thu, 21 Mar 2019 12:35:15 +0000 (05:35 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Mar 2019 12:35:15 +0000 (05:35 -0700)
am: 840623e94e

Change-Id: I9b51e6905245ada2707ef7498cc1b8e4cb4c69a0


Trivial merge