tree 749e3b2890a85c16badda55a72d670b7bec931bf
parent 295016b22b06a172a7ad9bcc75c4269c599a2af1
parent 8b5917965d4ca7fd4a614263a01312e930bb1646
author Irina Dumitrescu <irinaid@google.com> 1548353287 -0800
committer android-build-merger <android-build-merger@google.com> 1548353287 -0800

Merge "Add API for proxy configuration over VPN."
am: 8b5917965d

Change-Id: I647aec5f7678668b8ef7d616150adac1086dbbdd