OSDN Git Service

resolve merge conflicts of 00a44d2 to nyc-dev
authorSharvil Nanavati <sharvil@google.com>
Sat, 30 Apr 2016 00:06:08 +0000 (17:06 -0700)
committerSharvil Nanavati <sharvil@google.com>
Sat, 30 Apr 2016 01:59:08 +0000 (18:59 -0700)
commit5aa2f31c774c8a8c8b7b4d2e587ce921d4857403
tree6962c421b6b663ab9ead72d97b0a5ae6e43a846a
parent4ec6f7603acaf453a1f280e2fad1a1d0e35dbfa5
parent00a44d2508e85b953d7343452063ade286e40ca0
resolve merge conflicts of 00a44d2 to nyc-dev

Change-Id: I64ef6cb1eb5996674e9919d13fadd43ede1d4b8c
stack/avdt/avdt_l2c.c