OSDN Git Service

resolve merge conflicts of ee186e9 to oc-dev-plus-aosp
authorpkanwar <pkanwar@google.com>
Thu, 27 Apr 2017 20:15:56 +0000 (13:15 -0700)
committerpkanwar <pkanwar@google.com>
Thu, 27 Apr 2017 20:16:18 +0000 (13:16 -0700)
commit2a6951e07f3e6fcf1ce5b4e87f4be9fb31d6694b
treea25e28a53501a7406b20d3f8c072b0cc35e146fa
parentba70869b5373c12acdca8b056db47c44c85d0dce
parentee186e90c170e3d98de905d42b8415466f6fa656
resolve merge conflicts of ee186e9 to oc-dev-plus-aosp

Change-Id: I6f4b2606cc2f4e985a33f629e7861121b32a9952
Test: manual
Bug: 35606429
include/telephony/ril.h
libril/Android.mk
libril/ril.cpp
libril/ril_unsol_commands.h