Lorenzo Colitti 2b7db0cba5 resolve merge conflicts of 72fa0d4 to nyc-dev-plus-aosp am: 57f1e32 ...

am: 0928b62

* commit '0928b620d2f0b78d49b13059eba475da4801ad70':
  When the applicantion is removed, reset network permission of this uid.

Change-Id: I3750e3f805bfc71558025fe078f1ad25e5af7cff

2016-04-18 10:36:38 +00:00

..

core/java/com/android/server

resolve merge conflicts of 72fa0d4 to nyc-dev-plus-aosp am: 57f1e32

2016-04-18 10:36:38 +00:00

net/java/android/net/apf

Add a toString method to ApfCapabilities.

2016-03-28 17:33:30 +09:00

tests/servicestests

If Internet probe is redirected, pass redirect destination to NetworkAgent.

2016-04-12 08:54:36 -04:00