From: Andre Eisenbach <eisenbach@google.com>
Date: Thu, 4 Feb 2016 02:33:33 +0000 (+0000)
Subject: Merge "Implement createBondOutOfBand" am: c450f89460
X-Git-Tag: android-7.1.2_r17~197
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8088c73cf7ee43aa60b09d240bf98e6cf7b64735;p=android-x86%2Fpackages-apps-Bluetooth.git

Merge "Implement createBondOutOfBand" am: c450f89460
am: 28e370be5b  -s ours

* commit '28e370be5bbe2c54bb91c70f54b05326063e32ce':
  Implement createBondOutOfBand
---

8088c73cf7ee43aa60b09d240bf98e6cf7b64735