summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Eisenbach <eisenbach@google.com>2015-02-05 04:32:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-05 04:32:54 +0000
commitd6419cd6309bd20a2ab095c783bb6ad1f208bf4f (patch)
tree1ac6b887346cb26a471dac7879759087d8819f31
parentae9d174bc0afe0a7ed0bb4fb82836338fbb6adb1 (diff)
parent0a8c803a48fe5afa71d1f8660539012e9b1f9642 (diff)
downloadbluedroid-d6419cd6309bd20a2ab095c783bb6ad1f208bf4f.tar.gz
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 '0a8c803a48fe5afa71d1f8660539012e9b1f9642': DO NOT MERGE Change pairing_cb to assume temporary pairing by default
0 files changed, 0 insertions, 0 deletions