From: Matthew Xie <mattx@google.com>
Date: Thu, 16 Oct 2014 00:12:46 +0000 (+0000)
Subject: am c6342812: (-s ours) am 269eb418: am f777d24c: am 595bcb4c: (-s ours) DO NOT MERGE... 
X-Git-Tag: android-x86-7.1-r1~1374
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b93cf780d9797c838f2e5a72903548c5a628db99;p=android-x86%2Fsystem-bt.git

am c6342812: (-s ours) am 269eb418: am f777d24c: am 595bcb4c: (-s ours) DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2

* commit 'c6342812149683d5afcb3765dd5303951b1efdf0':
  DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2
---

b93cf780d9797c838f2e5a72903548c5a628db99