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