Robin Lee e61a30f635 Merge "Move some VPN logic out of ConnectivityService" ...

am: ec86462033

Change-Id: I212c2d6de1676ab65e6bbf34148d66e183d60c62

2017-03-30 16:08:50 +00:00

..

android/net

Address some comments on IpManagerTest

2017-03-14 13:02:49 +09:00

com/android/server

Merge "Move some VPN logic out of ConnectivityService"

2017-03-30 16:08:50 +00:00