Charles He 65e8bd2e04 Merge changes from topic "always-on-vpn" ...

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

2017-09-19 07:50:13 +00:00

..

android/net

Fix flaky NsdManagerTest

2017-09-13 18:38:53 +09:00

com/android

Merge changes from topic "always-on-vpn"

2017-09-19 07:50:13 +00:00