tree 323491ed34126ba76367953818301d285cbc9b0f
parent 67d16ec1ab8354ff9ab4ef2a7ad86363903241db
parent 5da5ae3b96769735a2dc5abe265101df545be828
author Charles He <qiurui@google.com> 1505807413 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1505807413 +0000

Merge changes from topic "always-on-vpn"

* changes:
  Opt-out for always-on VPN: rename API.
  Opt-out for always-on VPN