OSDN Git Service

resolve merge conflicts of a3ee2e35 to nyc-dev
authorPavlin Radoslavov <pavlin@google.com>
Tue, 14 Mar 2017 21:46:15 +0000 (14:46 -0700)
committerPavlin Radoslavov <pavlin@google.com>
Wed, 15 Mar 2017 04:22:19 +0000 (04:22 +0000)
commita33dd28064b98a63c7050814d7939e0a8b515b0e
tree5506da4ab3680c6c19b4c075fad7729177e0065f
parentfb309b3ce796efd9c2747d8209d113191c618193
parenta3ee2e350dfed89de5c43e95b079ce5e338760f7
resolve merge conflicts of a3ee2e35 to nyc-dev

Bug: 34946955
Change-Id: Ieff690edd3aa527a0639483ec8e1e3b661f0ecc4
Merged-In: I0b6f50dee05a58db8c043b4d01fb58c9acbeede9
stack/l2cap/l2c_main.c