tree 7daa9ddee24fb799156bd5fe4d1264606c881851
parent ec2b289d4268045f4f0226efe71d1c793b299476
parent 9a5d3ba1ad38debe3d3902338a935dd2d55b1a4a
author Benedict Wong <benedictwong@google.com> 1550170188 -0800
committer android-build-merger <android-build-merger@google.com> 1550170188 -0800

Merge "Add Test Network and Transport types"
am: 9a5d3ba1ad

Change-Id: I1cf33485adb9f4c442de42060697efe71bb45264