Paul Jensen 83e6bff540 Merge "ApfFilter unit test" into nyc-dev ...

am: cf12d6140b

* commit 'cf12d6140b923c3049f26b4e57bd64003c5885c9':
  ApfFilter unit test

Change-Id: I97bdf703c24c8c3008113c09f5f441cd1d74bc81

2016-05-13 14:38:13 +00:00

..

core/java/com/android/server

Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev

2016-05-06 23:38:59 +00:00

net/java/android/net/apf

ApfFilter unit test

2016-05-10 11:54:42 -04:00

tests/servicestests

Addressing API council comments on NetworkStatsManager.

2016-05-10 13:24:16 -07:00