Hugo Benichi b54260227b resolve merge conflicts of 8e9d612 to nyc-mr1-dev-plus-aosp ...

am: fc76c02ce2

Change-Id: I4bfd7a9bc5ef4c3c5a30bed63b92eaef90b1a30e

2016-09-25 20:18:16 +00:00

..

core/java/com/android/server

Restrict access to background networks to CHANGE_NETWORK_STATE. am: 1034b7c1ff am: 783c3e763d

2016-09-25 20:11:52 +00:00

net/java/android/net/apf

ApfFilter unit test

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

tests/servicestests

resolve merge conflicts of 8e9d612 to nyc-mr1-dev-plus-aosp

2016-09-25 20:18:16 +00:00