Charles He 85afa50569 Merge changes from topic "vpn-dialog" ...

* changes:
  Unbreak VPN unit tests.
  Add alert dialog when always-on VPN disconnects.

2017-09-19 07:56:44 +00:00

..

android/net

Fix flaky NsdManagerTest

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

com/android

Merge changes from topic "vpn-dialog"

2017-09-19 07:56:44 +00:00