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)
committerThe Android Automerger <android-build@android.com>
Wed, 22 Mar 2017 22:23:54 +0000 (15:23 -0700)
commita4875a49404c544134df37022ae587a4a3321647
treeb61df87fb03e135bf569f730d0f058416acf1dc2
parent5a9925784a4a34811ae29608b67dee4a580c226b
resolve merge conflicts of a3ee2e35 to nyc-dev

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