summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatalie Silvanovich <natashenka@google.com>2015-03-09 18:32:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-09 18:32:37 +0000
commit1e868f87341adad554233fdb7448c3f41e7d3aa0 (patch)
treeda92d422c4fbfbfd7e8f577081691aac94ad2aa1
parent3210f865592835629eae0e172dc55bbe1a822041 (diff)
parent0cd5a85ee83c1db54fb244300c072ef73c622861 (diff)
downloadbluedroid-1e868f87341adad554233fdb7448c3f41e7d3aa0.tar.gz
am 0cd5a85e: (-s ours) Merge "Change pairing_cb to assume temporary pairing by default"
* commit '0cd5a85ee83c1db54fb244300c072ef73c622861': Change pairing_cb to assume temporary pairing by default
0 files changed, 0 insertions, 0 deletions