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