| commit | 65aec3a3f62c004d7073470f18330007b7ecf230 | [log] [tgz] |
|---|---|---|
| author | Andre Eisenbach <eisenbach@google.com> | Thu Feb 05 03:51:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 05 03:51:51 2015 +0000 |
| tree | 6d11c60255df3d0ffa225ead50a53494d4a19288 | |
| parent | eebc8ab9c5e362d721f8f606f0a564ca9aff89d9 [diff] | |
| parent | 6d429d9d0a1b537600c652dda2bc98d4c4ebd783 [diff] |
am 6d429d9d: (-s ours) am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default * commit '6d429d9d0a1b537600c652dda2bc98d4c4ebd783': DO NOT MERGE Change pairing_cb to assume temporary pairing by default