OSDN Git Service

(root) / android-x86 / system-bt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fed4f89 f4835d6)
resolve merge conflicts of f4835d65e to oc-dr1-dev-plus-aosp
authorAndre Eisenbach <eisenbach@google.com>
Sat, 22 Jul 2017 00:33:51 +0000 (17:33 -0700)
committerAndre Eisenbach <eisenbach@google.com>
Sat, 22 Jul 2017 00:33:51 +0000 (17:33 -0700)
commitac78a6d9a2184d650c797b4b85dce19c4fe2e47a
tree9f48480582cb3e90189ed2dcf34022e7f4ae1c06tree | snapshot
parentfed4f893e47b6fbd3dfcb9fcb70cb7eec744de3fcommit | diff
parentf4835d65ed48cba61629ce7987e8cc8c0df7e0b7commit | diff
resolve merge conflicts of f4835d65e to oc-dr1-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icfc01cdf5b6c14711186b5412c996f66d9611373
bta/dm/bta_dm_act.cc diff1 | diff2 | blob | history
system/bt
About OSDN
Find Software
Develop Software
Help