OSDN Git Service

resolve merge conflicts of 77eb76c to oc-dev-plus-aosp
authorAmit Mahajan <amitmahajan@google.com>
Tue, 4 Apr 2017 22:26:21 +0000 (15:26 -0700)
committerAmit Mahajan <amitmahajan@google.com>
Tue, 4 Apr 2017 22:26:21 +0000 (15:26 -0700)
commitdd0b80d0b0074499de9a1faa74f6927c30b44201
treefce3eb8b7610101c2835b0deb06601cf25b201c0
parent0ed5b5f1d54b84c4519fb8c9a76c7e46b470e522
parent77eb76cebe41427191a8a384f4cb70417ce3dd3a
resolve merge conflicts of 77eb76c to oc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic7897aba8a92273bd5939417628963ef2304556f
include/telephony/ril.h
libril/RilSapSocket.cpp
libril/ril.cpp
rild/rild.c