Lorenzo Colitti 7c363bb905 Merge "Don't complain if a VPN changes capabilities." into pi-dev ...

am: 8273ef4778

Change-Id: I26d2e1526c21ad2bac369a565b06155780190692

2018-05-31 10:41:34 -07:00

..

core/java/com/android/server

Merge "Don't complain if a VPN changes capabilities." into pi-dev

2018-05-31 10:41:34 -07:00

net/java/android/net

apf: Add counters for dropped / passed packets

2018-04-27 23:30:23 +09:00