tree 51800199bc0e2792e1b84080c3a14097f3b092cd
parent 2d7bbb4230488507a8521df5a9002d59a28a9a1f
parent f5f95fce12f96038ea5dc9d4cac3e16a94893977
author Paul Hu <paulhu@google.com> 1566852830 -0700
committer android-build-merger <android-build-merger@google.com> 1566852830 -0700

Merge "Add SocketUtils CTS tests am: 0141ef0948 am: f770a59ba2" into qt-r1-dev-plus-aosp
am: f5f95fce12

Change-Id: I26b15368b078084158ad91df5d26cea93aff8cd4