tree 486f24e9f502830fa78808929de03d0a07b446c1
parent 595bcb4c72aaa2a9a54a23b127dd5fa9842876ca
parent eebc8ab9c5e362d721f8f606f0a564ca9aff89d9
author Andre Eisenbach <eisenbach@google.com> 1423107523 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423107523 +0000

am eebc8ab9: DO NOT MERGE Change pairing_cb to assume temporary pairing by default

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