tree 1ac6b887346cb26a471dac7879759087d8819f31
parent cf7f6a154aed48659260d391994dc59151be937b
parent a708936da347b32f2a0811b5f33d9068c2b0de6f
author Andre Eisenbach <eisenbach@google.com> 1423102272 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423102272 +0000

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

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