tree d8b29c80d485527fa3a44fca83f7a63b7bef9db5
parent 7fbc6954fac90dd7148ac73aa478fcc5e2d75be8
parent 893637614568b8ac7dc996c2e9bdbde481fbdc08
author Andre Eisenbach <eisenbach@google.com> 1422469528 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422469528 +0000

am 89363761: Change pairing_cb to assume temporary pairing by default

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