tree 4f6746f4e073ffb12298d1631aa533f1e23698a8
parent b68105ca4a4fc37da18321472e2f823c6c0f4c40
parent 0ad6cfdee8857a7bc54d4c3eb98bf1cdc82dc9a7
author Andre Eisenbach <eisenbach@google.com> 1423181207 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423181207 +0000

am 0ad6cfde: am ce5ae4ab: am a708936d: DO NOT MERGE Change pairing_cb to assume temporary pairing by default

* commit '0ad6cfdee8857a7bc54d4c3eb98bf1cdc82dc9a7':
  DO NOT MERGE Change pairing_cb to assume temporary pairing by default