Robin Lee 7f13b648df Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev ...

am: 4c2242b254

* commit '4c2242b254668caa96abc59e9f6c08eef7dc3784':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: Ibc69bb988ba0d1e641ee48fb5a844dc414f58e07

2016-05-04 18:55:54 +00:00

..

core/java/com/android/server

Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev

2016-05-04 18:55:54 +00:00

net/java/android/net/apf

Add a toString method to ApfCapabilities.

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

tests/servicestests

Cap number of NetworkRequests a UID can make to 100

2016-04-20 10:52:47 -04:00