OSDN Git Service

am 65aec3a3: am 6d429d9d: (-s ours) am 3efb9e2e: DO NOT MERGE Change pairing_cb to...
authorAndre Eisenbach <eisenbach@google.com>
Thu, 5 Feb 2015 04:21:04 +0000 (04:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Feb 2015 04:21:04 +0000 (04:21 +0000)
* commit '65aec3a3f62c004d7073470f18330007b7ecf230':
  DO NOT MERGE Change pairing_cb to assume temporary pairing by default


Trivial merge