Hugo Benichi 3cabd2665c resolve merge conflicts of 6d40db6 to nyc-mr1-dev-plus-aosp ...

Change-Id: I82865b2847c584f8a1d728ef76113e3969f222ca

2016-09-23 14:48:01 +09:00

..

core/java/com/android/server

Restrict access to background networks to CHANGE_NETWORK_STATE. am: b8d9f52adb

2016-09-23 04:01:07 +00:00

net/java/android/net/apf

ApfFilter unit test

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

tests/servicestests

resolve merge conflicts of 6d40db6 to nyc-mr1-dev-plus-aosp

2016-09-23 14:48:01 +09:00