am 11fd7c54: DO NOT MERGE Do not set sig_id in gerneral reject message per...
am 11fd7c54: DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2 automerge: 9ff407b1 -s ours automerge: b77bbf8f -s ours
automerge: 25d36ec2 -s ours
* commit '25d36ec2':