OSDN Git Service

(root) / android-x86 / hardware-ril.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a2ca4f5 2a6951e)
resolve merge conflicts of ee186e9 to oc-dev-plus-aosp
authorpkanwar <pkanwar@google.com>
Thu, 27 Apr 2017 21:22:25 +0000 (21:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Apr 2017 21:22:25 +0000 (21:22 +0000)
am: 2a6951e07f  -s ours

Change-Id: Ib0e235f4f34fea50c641855774c01ace3368af93


Trivial merge
hardware/ril
About OSDN
Find Software
Develop Software
Help