tree 5e412140b6655992f43c021789318aa2bd702ac0
parent e0233061e1e57dfcb337951021afabe85ae1f5d3
parent 477b525bf92512d6da972114c087a35f03c7d3d4
author Paul Hu <paulhu@google.com> 1566857801 -0700
committer android-build-merger <android-build-merger@google.com> 1566857801 -0700

[automerger skipped] Merge "Add SocketUtils CTS tests am: 0141ef0948" into qt-dev-plus-aosp am: 364c77f92e am: f6a8f19632
am: 477b525bf9 -s ours
am skip reason: change_id I36252fdf516cf4a9d4506b615cdb38f5413739e5 with SHA1 93a53224d3 is in history

Change-Id: I42f498e0596eb2dce855f0267b76b4f04c4f31aa