Robin Lee 88228712ee Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: fb0faa494e ...

am: 78d0888e8c

* commit '78d0888e8c9358681a6f564b30b2cc35bbe72a45':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I7ec39775980ec839aa814cf284ea352789aa788f

2016-05-04 21:41:23 +00:00

..

core/java/com/android/server

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

2016-05-04 21:41:23 +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