OSDN Git Service

Merge "Add device record for BR/EDR devices with derived LE keys" am: fbf43ab2c5...
authorSubramanian Srinivasan <subrsrin@codeaurora.org>
Sat, 15 Oct 2016 00:55:20 +0000 (00:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 15 Oct 2016 00:55:20 +0000 (00:55 +0000)
am: 9363b628ae

Change-Id: If8d64a374a579df8e6f63c41792a6897f434e0c8


Trivial merge