Chalard Jean f6c1bf66ba Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: dce4d4ca32 ...

am: e999899287

Change-Id: I7f08217c5abc86a8784b91145f1b02d6693b3919

2018-03-02 13:17:23 +00:00

..

core/java/com/android/server

Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: dce4d4ca32

2018-03-02 13:17:23 +00:00

net/java/android/net

Clarify some IpManager/ApfFilter debugging output.

2017-04-26 17:17:04 +09:00