| commit | 6d429d9d0a1b537600c652dda2bc98d4c4ebd783 | [log] [tgz] |
|---|---|---|
| author | Andre Eisenbach <eisenbach@google.com> | Thu Feb 05 03:26:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 05 03:26:29 2015 +0000 |
| tree | 485581ea2253198f8796020eff53f7208a50d07d | |
| parent | 4a5fc6964313a606abd89268b8a53036b14b4ad7 [diff] | |
| parent | 3efb9e2e11471a67329ad17d48ffa79118ea76c6 [diff] |
am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default * commit '3efb9e2e11471a67329ad17d48ffa79118ea76c6': DO NOT MERGE Change pairing_cb to assume temporary pairing by default