OSDN Git Service

am 0cd5a85e: (-s ours) Merge "Change pairing_cb to assume temporary pairing by default"
authorNatalie Silvanovich <natashenka@google.com>
Mon, 9 Mar 2015 18:32:37 +0000 (18:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 9 Mar 2015 18:32:37 +0000 (18:32 +0000)
commit1e868f87341adad554233fdb7448c3f41e7d3aa0
treeda92d422c4fbfbfd7e8f577081691aac94ad2aa1
parent3210f865592835629eae0e172dc55bbe1a822041
parent0cd5a85ee83c1db54fb244300c072ef73c622861
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