tree 6d11c60255df3d0ffa225ead50a53494d4a19288
parent eebc8ab9c5e362d721f8f606f0a564ca9aff89d9
parent 6d429d9d0a1b537600c652dda2bc98d4c4ebd783
author Andre Eisenbach <eisenbach@google.com> 1423108311 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423108311 +0000

am 6d429d9d: (-s ours) am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default

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