OSDN Git Service

am 5be46131: (-s ours) am 0ad6cfde: am ce5ae4ab: am a708936d: DO NOT MERGE Change...
authorAndre Eisenbach <eisenbach@google.com>
Fri, 6 Feb 2015 13:31:42 +0000 (13:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Feb 2015 13:31:42 +0000 (13:31 +0000)
commit83821b0eecc7bbd07ba6559947950c616242aa52
tree4f6746f4e073ffb12298d1631aa533f1e23698a8
parentc5b81cd337c248721c2d91018098e3f1e7919c12
parent5be461319d94b47756326422aafb9203323d3d06
am 5be46131: (-s ours) am 0ad6cfde: am ce5ae4ab: am a708936d: DO NOT MERGE Change pairing_cb to assume temporary pairing by default

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