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

am e791f732: am ae9d174b: am 408dec19: am 977acabd: (-s ours) am eebc8ab9: DO NOT MERGE Change pairing_cb to assume temporary pairing by default

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