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