Chalard Jean 58c3355b8f Merge "Give VPNs the INTERNET capability when they route most of the IP space" ...

am: ef307293e5

Change-Id: Icd1466c79d2593fcab5bd2e31a1acb3a36a705da

2018-03-02 12:34:25 +00:00

..

java/android/net

Merge "Give VPNs the INTERNET capability when they route most of the IP space"

2018-03-02 12:34:25 +00:00

jni

frameworks/base: use proper nativehelper headers

2017-07-19 10:06:40 -07:00