Robin Lee 4385168b4b Merge "Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: fb0faa494e am: 78d0888e8c" into nyc-mr1-dev-plus-aosp ...

am: 062a28b6a4

* commit '062a28b6a403a48d6f5f88e109a899c9c60581c1':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I9ebd6221451ee10649a1f340031d62c6483832f1

2016-05-04 22:04:40 +00:00

..

java/android/net

Merge "Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: fb0faa494e am: 78d0888e8c" into nyc-mr1-dev-plus-aosp

2016-05-04 22:04:40 +00:00

jni

Remove framework code that calls SIOCKILLADDR

2016-03-22 12:54:32 +09:00

tests/coretests

NetworkStats.Bucket API polish.

2016-03-14 11:24:12 -07:00