OSDN Git Service

(root) / android-x86 / hardware-ril.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c963b67 ccd27b0)
resolve merge conflicts of ccd27b0 to stage-aosp-master
authorDavid 'Digit' Turner <digit@google.com>
Thu, 23 Jun 2016 08:35:49 +0000 (10:35 +0200)
committerDavid 'Digit' Turner <digit@google.com>
Thu, 23 Jun 2016 08:35:49 +0000 (10:35 +0200)
Change-Id: Ic5a6bb461c60646d7f9798cb1bf99110c6592f91

1  2 
rild/rild.c patch | diff1 | diff2 | blob | history

diff --cc rild/rild.c
Simple merge
hardware/ril
About OSDN
Find Software
Develop Software
Help