From: Andre Eisenbach <eisenbach@google.com>
Date: Thu, 5 Feb 2015 04:21:04 +0000 (+0000)
Subject: am 65aec3a3: am 6d429d9d: (-s ours) am 3efb9e2e: DO NOT MERGE Change pairing_cb to... 
X-Git-Tag: android-x86-7.1-r1~1261^2~5^2~5^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7f34538ac0e447a88d1f54ff819c28b3574f0aa4;p=android-x86%2Fsystem-bt.git

am 65aec3a3: am 6d429d9d: (-s ours) am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default

* commit '65aec3a3f62c004d7073470f18330007b7ecf230':
  DO NOT MERGE Change pairing_cb to assume temporary pairing by default
---

7f34538ac0e447a88d1f54ff819c28b3574f0aa4