OSDN Git Service

(root) / android-x86 / system-bt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 583a701) | patch
resolve merge conflicts of ec78d74706c3e81f91eee53e3d9f959f66e5d77f to pi-dev
authorHansong Zhang <hsz@google.com>
Sat, 2 Feb 2019 01:45:30 +0000 (17:45 -0800)
committerJP Sugarbroad <jpsugar@google.com>
Tue, 12 Feb 2019 21:37:23 +0000 (13:37 -0800)
commit5cd56bc3d272408d3100331a457a8b3d51dce2e1
tree4ee0aa32cfefa6582bc3f904b4ac04e38b1a29d3tree | snapshot
parent583a7016e4f4167df2efe4e25dc80b6c4aa1f834commit | diff
resolve merge conflicts of ec78d74706c3e81f91eee53e3d9f959f66e5d77f to pi-dev

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id658b3485fdc0025bc44850be9f23bb2d2146d9b
(cherry picked from commit 6c0f22f324ed0bdf9dea3e803e5ee6176d03fdb4)
stack/l2cap/l2c_main.cc diff | blob | history
stack/l2cap/l2c_utils.cc diff | blob | history
system/bt
About OSDN
Find Software
Develop Software
Help