From: Andre Eisenbach <eisenbach@google.com>
Date: Thu, 5 Feb 2015 05:02:29 +0000 (+0000)
Subject: am d6f2fa93: (-s ours) am d6419cd6: am 0a8c803a: am 7f34538a: (-s ours) am 65aec3a3... 
X-Git-Tag: android-x86-7.1-r1~1281^2~3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=aad9d651a54da13107908b5d55ba19cef212ceff;p=android-x86%2Fsystem-bt.git

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

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

aad9d651a54da13107908b5d55ba19cef212ceff