OSDN Git Service

Merge changes from topic "always-on-vpn"
authorCharles He <qiurui@google.com>
Tue, 19 Sep 2017 07:50:13 +0000 (07:50 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 19 Sep 2017 07:50:13 +0000 (07:50 +0000)
commitcc15c7f8c17624faef67f466dd28985904a743b9
tree323491ed34126ba76367953818301d285cbc9b0f
parent67d16ec1ab8354ff9ab4ef2a7ad86363903241db
parent5da5ae3b96769735a2dc5abe265101df545be828
Merge changes from topic "always-on-vpn"

* changes:
  Opt-out for always-on VPN: rename API.
  Opt-out for always-on VPN
api/current.txt
api/system-current.txt
api/test-current.txt
services/core/java/com/android/server/ConnectivityService.java