am 8a37e0b3: am 48c2210b: am 4a4d6864: Merge "Fix testVpn timing issue for com.android.cts.net.HostsideNetworkTests class" into lollipop-mr1-cts-dev

* commit '8a37e0b3eb18598acef27dc774c2ab15bf881a74':
  Fix testVpn timing issue for com.android.cts.net.HostsideNetworkTests class
tree: 96863bb59cca7c1307e283558304ebf05fe94a34
  1. tests/