From: Matthew Xie <mattx@google.com>
Date: Wed, 14 Aug 2013 07:32:04 +0000 (+0000)
Subject: Merge "LE: Add instance ID to descriptors (4/4)" into klp-dev
X-Git-Tag: android-7.1.2_r17~914^2~41
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=59f7aee8;p=android-x86%2Fpackages-apps-Bluetooth.git

Merge "LE: Add instance ID to descriptors (4/4)" into klp-dev
---

59f7aee85186fa07fc29ea941cfdab99e7c87d91