OSDN Git Service

am d6f2fa93: am d6419cd6: am 0a8c803a: am 7f34538a: (-s ours) am 65aec3a3: am 6d429d9...
authorAndre Eisenbach <eisenbach@google.com>
Fri, 6 Feb 2015 00:06:48 +0000 (00:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Feb 2015 00:06:48 +0000 (00:06 +0000)
* commit 'd6f2fa93052c1d9bdf6035ace6b32345013516db':
  DO NOT MERGE Change pairing_cb to assume temporary pairing by default


Trivial merge