resolved conflicts for merge of 988d3d71 to honeycomb-plus-aosp

Change-Id: I85178afbca0b8b51eb3890958b063a70a1b33b96

diff --cc reference-ril/reference-ril.c
index 02a7e12,bdb8945..ce2b0ce
--- 1/reference-ril/reference-ril.c
--- 2/reference-ril/reference-ril.c
+++ b/reference-ril/reference-ril.c
@@@ -32,9 -33,7 +32,10 @@@
  #include <sys/socket.h>
  #include <cutils/sockets.h>
  #include <termios.h>
 +#include <sys/system_properties.h>
 +
 +#include "ril.h"
+ #include "hardware/qemu_pipe.h"
  
  #define LOG_TAG "RIL"
  #include <utils/Log.h>