OSDN Git Service

resolve merge conflicts of ec78d74706c3e81f91eee53e3d9f959f66e5d77f to pi-dev
authorHansong Zhang <hsz@google.com>
Sat, 2 Feb 2019 04:54:07 +0000 (20:54 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 2 Feb 2019 04:54:07 +0000 (20:54 -0800)
commit35cfa7f0e3f204c4fcf32508f7724aa443629d89
tree224ee521e4d7ae77bc92899a6d6f60f744e4252c
parent3b7c9348c7ce55d0e8434b64c969cd5c88ac3b95
parent6c0f22f324ed0bdf9dea3e803e5ee6176d03fdb4
resolve merge conflicts of ec78d74706c3e81f91eee53e3d9f959f66e5d77f to pi-dev
am: 6c0f22f324

Change-Id: Ic65233e9644f69567086a674b654f6a3b30b838e
stack/l2cap/l2c_utils.cc