resolve merge conflicts of c9badf1 to nyc-dev-plus-aosp

Change-Id: I59d138a61554a2439577bcfdf400ea663c6bb91d

diff --cc libril/RilSapSocket.cpp
Simple merge

diff --cc libril/ril.cpp
index c283eaf,52f46a7..dcc380e
mode 100755,100644..100755
--- 1/libril/ril.cpp
--- 2/libril/ril.cpp
+++ b/libril/ril.cpp
@@@ -87,13 -84,9 +87,13 @@@ namespace android 
  /* Constants for response types */
  #define RESPONSE_SOLICITED 0
  #define RESPONSE_UNSOLICITED 1
 +#define RESPONSE_SOLICITED_ACK 2
 +#define RESPONSE_SOLICITED_ACK_EXP 3
 +#define RESPONSE_UNSOLICITED_ACK_EXP 4
  
  /* Negative values for private RIL errno's */
- #define RIL_ERRNO_INVALID_RESPONSE -1
- #define RIL_ERRNO_NO_MEMORY -12
+ #define RIL_ERRNO_INVALID_RESPONSE (-1)
++#define RIL_ERRNO_NO_MEMORY (-12)
  
  // request, response, and unsolicited msg print macro
  #define PRINTBUF_SIZE 8096

diff --cc reference-ril/atchannel.c
Simple merge