OSDN Git Service

(root) / android-x86 / system-bt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c126582 7d0ad23)
resolve merge conflicts of 7d0ad232f to oc-dev-plus-aosp
authorPavlin Radoslavov <pavlin@google.com>
Thu, 13 Jul 2017 18:48:43 +0000 (11:48 -0700)
committerPavlin Radoslavov <pavlin@google.com>
Thu, 13 Jul 2017 18:48:47 +0000 (11:48 -0700)
Test: Code inspection.
Change-Id: I13a192920f58d8cea622a6acb2fb46fd07fdd195

1  2 
stack/bnep/bnep_utils.cc patch | diff1 | diff2 | blob | history

diff --cc stack/bnep/bnep_utils.cc
Simple merge
system/bt
About OSDN
Find Software
Develop Software
Help