Merge changes from topic "lnh-platform-split" am: 9ee9dcf07e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764

Change-Id: Ie34095ddf885fcf57e2a7bcb89817485564e9100
This commit is contained in:
Orion Hodson
2020-06-25 07:58:17 +00:00
committed by Automerger Merge Worker

View File

@@ -30,7 +30,7 @@
#include <DnsProxydProtocol.h> // NETID_USE_LOCAL_NAMESERVERS #include <DnsProxydProtocol.h> // NETID_USE_LOCAL_NAMESERVERS
#include <android_runtime/AndroidRuntime.h> #include <android_runtime/AndroidRuntime.h>
#include <cutils/properties.h> #include <cutils/properties.h>
#include <nativehelper/JNIHelp.h> #include <nativehelper/JNIPlatformHelp.h>
#include <nativehelper/ScopedLocalRef.h> #include <nativehelper/ScopedLocalRef.h>
#include <utils/Log.h> #include <utils/Log.h>
#include <utils/misc.h> #include <utils/misc.h>