OSDN Git Service

am e791f732: am ae9d174b: am 408dec19: am 977acabd: (-s ours) am eebc8ab9: DO NOT...
authorAndre Eisenbach <eisenbach@google.com>
Fri, 6 Feb 2015 00:06:47 +0000 (00:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Feb 2015 00:06:47 +0000 (00:06 +0000)
* commit 'e791f73202a2832b4d20dbc1ecd4b520adbb75d3':
  DO NOT MERGE Change pairing_cb to assume temporary pairing by default


Trivial merge