Chalard Jean 1be320a494 Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: 6001f72478 ...

am: e5e819f078

Change-Id: I7f08217c5abc86a8784b91145f1b02d6693b3919

2018-03-02 13:17:23 +00:00

..

java

Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: 6001f72478

2018-03-02 13:17:23 +00:00

jni

Merge "Don't use cutils/Atomic.h" am: 07735797a2

2018-02-28 14:01:17 +00:00

proto/android

Merge "Hidden API blacklisting killswitch." am: 46656fa28e

2018-02-16 16:39:59 +00:00

res

Notify the user and turn off tethering when the service is disallowed.

2018-02-28 17:52:38 +09:00

tests

Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." am: c164c83191

2018-03-01 11:53:43 +00:00