From: Elliott Hughes Date: Thu, 27 Aug 2015 14:43:18 +0000 (+0000) Subject: am d835f68a: am e5faca1d: (-s ours) am bdb15a2a: Merge "Use _WIN32 rather than HAVE_W... X-Git-Tag: android-x86-7.1-r1~68 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=884e540454b4a04e2f280d6a0bf3fae9d90d7e10;p=android-x86%2Fhardware-ril.git am d835f68a: am e5faca1d: (-s ours) am bdb15a2a: Merge "Use _WIN32 rather than HAVE_WINSOCK in librilutils." * commit 'd835f68a18653a4b14619f81d186e708ff1fec5e': --- 884e540454b4a04e2f280d6a0bf3fae9d90d7e10