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

am: 64b0e44329

Change-Id: Ia3b91ebb942b4ab413ef4c76a06880c62e8581f9
This commit is contained in:
Chih-hung Hsieh
2016-06-27 21:36:48 +00:00
committed by android-build-merger

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";