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 am: 64b0e44329

Browse Source 
am: 9197c89071

Change-Id: I829286b8c46ba540a4bf57a1f5ba6aee04a70535
This commit is contained in:
Chih-Hung Hsieh
2016-06-27 21:39:12 +00:00
committed by android-build-merger
parent 1cd1ded4dc 9197c89071
commit ab757b423f
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 <android/multinetwork.h>
#define UNUSED(X) ((void) X)
#define UNUSED(X) ((void) (X))
static const char kHostname[] = "connectivitycheck.android.com";