LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve merge conflicts of 079d417 to stage-aosp-master

Browse Source 
Change-Id: Ib8b7ed43d6c8dc4a9b843e6d2a974af30bcba0a0
This commit is contained in:
Chih-Hung Hsieh
2016-06-24 12:17:53 -07:00
parent d1970e861b 60bd0b56fb
commit 64b0e44329
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cts/net/jni/NativeMultinetworkJni.c
View File

@@ -30,7 +30,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <android/multinetwork.h> #include <android/multinetwork.h>
#define UNUSED(X) ((void) X) #define UNUSED(X) ((void) (X))
static const char kHostname[] = "connectivitycheck.android.com"; static const char kHostname[] = "connectivitycheck.android.com";