OSDN Git Service

resolve merge conflicts of 405ec18 to nyc-dev
authorSharvil Nanavati <sharvil@google.com>
Fri, 29 Apr 2016 18:34:08 +0000 (18:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Apr 2016 18:34:08 +0000 (18:34 +0000)
am: 2ef994a0ab

* commit '2ef994a0abccc556de97c22d517001801f344046':
  Disable 3Mbps packets for AVDT ACL links

Change-Id: I8c804d6d8a78b8c77bfa65ed5fe988c77125a67a


Trivial merge