Jeremy Joslin aab3bd7f44 Merge "NetworkRecommendationProviders require the location permission."

2017-08-02 21:33:35 +00:00

..

java/com/android/server

Merge "NetworkRecommendationProviders require the location permission."

2017-08-02 21:33:35 +00:00

jni

Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master am: 7d7c269944 am: 81972a18e4

2017-08-02 15:38:40 +00:00

Android.mk

Revert "services.core: remove use of -static hidl java"

2017-08-02 18:20:13 +00:00