OSDN Git Service

am d8d98105: am 1e868f87: am 0cd5a85e: (-s ours) Merge "Change pairing_cb to assume...
authorNatalie Silvanovich <natashenka@google.com>
Tue, 10 Mar 2015 18:15:15 +0000 (18:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 10 Mar 2015 18:15:15 +0000 (18:15 +0000)
commit7296d7b9beff8060342ee879afea85cecd5e1b1d
tree0b7db3c1aabfa9fc8e2f70e45d0977efeb55099a
parent3eaee641dfcf14dad3874edd9534057f103f6806
parentd8d98105ba5fd2f03ee5babc59227d220973f210
am d8d98105: am 1e868f87: am 0cd5a85e: (-s ours) Merge "Change pairing_cb to assume temporary pairing by default"

* commit 'd8d98105ba5fd2f03ee5babc59227d220973f210':
  Change pairing_cb to assume temporary pairing by default