| commit | 977acabd3744a3308057b1485c7ac8658698e96b | [log] [tgz] |
|---|---|---|
| author | Andre Eisenbach <eisenbach@google.com> | Thu Feb 05 03:38:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 05 03:38:43 2015 +0000 |
| tree | 486f24e9f502830fa78808929de03d0a07b446c1 | |
| parent | 595bcb4c72aaa2a9a54a23b127dd5fa9842876ca [diff] | |
| parent | eebc8ab9c5e362d721f8f606f0a564ca9aff89d9 [diff] |
am eebc8ab9: DO NOT MERGE Change pairing_cb to assume temporary pairing by default * commit 'eebc8ab9c5e362d721f8f606f0a564ca9aff89d9': DO NOT MERGE Change pairing_cb to assume temporary pairing by default