am 06f8fdfa: (-s ours) am 0471a304: DO NOT MERGE Change pairing_cb to assume...
am 06f8fdfa: (-s ours) am 0471a304: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit '06f8fdfa':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default