| commit | 5be461319d94b47756326422aafb9203323d3d06 | [log] [tgz] |
|---|---|---|
| author | Andre Eisenbach <eisenbach@google.com> | Fri Feb 06 00:06:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 06 00:06:47 2015 +0000 |
| tree | 4f6746f4e073ffb12298d1631aa533f1e23698a8 | |
| parent | b68105ca4a4fc37da18321472e2f823c6c0f4c40 [diff] | |
| parent | 0ad6cfdee8857a7bc54d4c3eb98bf1cdc82dc9a7 [diff] |
am 0ad6cfde: am ce5ae4ab: am a708936d: DO NOT MERGE Change pairing_cb to assume temporary pairing by default * commit '0ad6cfdee8857a7bc54d4c3eb98bf1cdc82dc9a7': DO NOT MERGE Change pairing_cb to assume temporary pairing by default