resolve merge conflicts of 079d417 to stage-aosp-master am: 64b0e44329 am: 9197c89071
am: ab757b423f
Change-Id: If26141a6ea6bc4d7f9e2966cbd1b7309530c634e
This commit is contained in:
@@ -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";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user