tree da92d422c4fbfbfd7e8f577081691aac94ad2aa1
parent 3210f865592835629eae0e172dc55bbe1a822041
parent 0cd5a85ee83c1db54fb244300c072ef73c622861
author Natalie Silvanovich <natashenka@google.com> 1425925957 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425925957 +0000

am 0cd5a85e: (-s ours) Merge "Change pairing_cb to assume temporary pairing by default"

* commit '0cd5a85ee83c1db54fb244300c072ef73c622861':
  Change pairing_cb to assume temporary pairing by default