tree 4f6746f4e073ffb12298d1631aa533f1e23698a8
parent 277005e40d677bcd7c982822bd2a4b2cc2e47609
parent d6f2fa93052c1d9bdf6035ace6b32345013516db
author Andre Eisenbach <eisenbach@google.com> 1423181208 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423181208 +0000

am d6f2fa93: am d6419cd6: am 0a8c803a: am 7f34538a: (-s ours) am 65aec3a3: am 6d429d9d: (-s ours) am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default

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