| commit | 1aa51f8eb4a6a70284e80a447ea69b0efdd01569 | [log] [tgz] |
|---|---|---|
| author | Orion Hodson <oth@google.com> | Thu Jun 25 07:58:17 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 25 07:58:17 2020 +0000 |
| tree | 8c4406eb3649ef403faa6496892864eec6fcda9d | |
| parent | 43e6ff5364f0ce1054c94775d83323c7098f1f48 [diff] | |
| parent | 8af442d45e7137a16b4f4de732a9adeb8913b5e3 [diff] |
Merge changes from topic "lnh-platform-split" am: 8af442d45e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764 Change-Id: Ie34095ddf885fcf57e2a7bcb89817485564e9100
diff --git a/core/jni/android_net_NetUtils.cpp b/core/jni/android_net_NetUtils.cpp index d4805ac..e56809f 100644 --- a/core/jni/android_net_NetUtils.cpp +++ b/core/jni/android_net_NetUtils.cpp
@@ -30,7 +30,7 @@ #include <DnsProxydProtocol.h> // NETID_USE_LOCAL_NAMESERVERS #include <android_runtime/AndroidRuntime.h> #include <cutils/properties.h> -#include <nativehelper/JNIHelp.h> +#include <nativehelper/JNIPlatformHelp.h> #include <nativehelper/ScopedLocalRef.h> #include <utils/Log.h> #include <utils/misc.h>