tree dacdb5a72adbf17cd2363a97777839082a64e994
parent 588413cf2b8ec38420c0bfaea3294804606904f8
parent 909baeddfab43c12bfc5be53f35786fdb8e80a4a
author Irina Dumitrescu <irinaid@google.com> 1551247735 -0800
committer android-build-merger <android-build-merger@google.com> 1551247735 -0800

Merge "Add @NonNull annotation to set proxy on VPN parameter."
am: 909baeddfa

Change-Id: I0213524c6b71576bafb46e5b9378c3f43a325888