OSDN Git Service

resolve merge conflicts of c9badf1 to nyc-dev-plus-aosp
authorRobert Greenwalt <rgreenwalt@google.com>
Mon, 16 May 2016 19:36:42 +0000 (12:36 -0700)
committerRobert Greenwalt <rgreenwalt@google.com>
Mon, 16 May 2016 19:36:42 +0000 (12:36 -0700)
commit78e2c9c17f922cd2c8b3116fa6b228ea990d8f4b
tree4da4d5f7c1d53c363c57fd71dca1d0588bfc1f21
parent63a8a6cd32d75857925fd54a2ecd173ddfa9322a
parentc9badf18c6b7ed62a4e0f997e62b716cca3b5db9
resolve merge conflicts of c9badf1 to nyc-dev-plus-aosp

Change-Id: I59d138a61554a2439577bcfdf400ea663c6bb91d
libril/RilSapSocket.cpp
libril/ril.cpp
reference-ril/atchannel.c