summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Eisenbach <eisenbach@google.com>2015-02-05 04:01:12 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-05 04:01:12 +0000
commitae9d174bc0afe0a7ed0bb4fb82836338fbb6adb1 (patch)
tree1ac6b887346cb26a471dac7879759087d8819f31
parentce5ae4abddaab8865bb44c83d2d44e14b0d7536b (diff)
parent408dec1991255be919b1605e5cfe983b7f7154e9 (diff)
downloadbluedroid-ae9d174bc0afe0a7ed0bb4fb82836338fbb6adb1.tar.gz
am 408dec19: am 977acabd: (-s ours) am eebc8ab9: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit '408dec1991255be919b1605e5cfe983b7f7154e9': DO NOT MERGE Change pairing_cb to assume temporary pairing by default
0 files changed, 0 insertions, 0 deletions