tree 8944b293af9c13e3027dee6d369de852299cc074
parent ec5579e05484df10dd6a29b84250aa05e1a82d84
parent 1ca625c2cb1b75a3333459d7b0f3b1962c9914df
author Irina Dumitrescu <irinaid@google.com> 1548428416 -0800
committer android-build-merger <android-build-merger@google.com> 1548428416 -0800

Merge "CTS test for setting HTTP proxy on a VPN network."
am: 1ca625c2cb

Change-Id: I002c03ebdb966157d11c511e1504991f5e8d7a30