| commit | d8d98105ba5fd2f03ee5babc59227d220973f210 | [log] [tgz] |
|---|---|---|
| author | Natalie Silvanovich <natashenka@google.com> | Mon Mar 09 18:36:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 09 18:36:45 2015 +0000 |
| tree | ac8a416de0b544309d6dd737577192c1c00b7cb4 | |
| parent | 69ce4008c17940226fd9b90bb139068bf8eef575 [diff] | |
| parent | 1e868f87341adad554233fdb7448c3f41e7d3aa0 [diff] |
am 1e868f87: am 0cd5a85e: (-s ours) Merge "Change pairing_cb to assume temporary pairing by default" * commit '1e868f87341adad554233fdb7448c3f41e7d3aa0': Change pairing_cb to assume temporary pairing by default