From: Andre Eisenbach <eisenbach@google.com>
Date: Mon, 8 May 2017 19:28:28 +0000 (+0000)
Subject: Merge "Reject LE COC if cid is duplicated" am: 95e3c5ac39 am: 890b25c8b1
X-Git-Tag: android-x86-9.0-r1~486^2~67
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cb7fd93dc2ae942b1b1043ae9923f7ea245cc53d;p=android-x86%2Fsystem-bt.git

Merge "Reject LE COC if cid is duplicated" am: 95e3c5ac39 am: 890b25c8b1
am: 97331a79eb

Change-Id: Idea373689e7e82f5f9b99f6ce9ceec84313f2680
---

cb7fd93dc2ae942b1b1043ae9923f7ea245cc53d