| commit | d6f2fa93052c1d9bdf6035ace6b32345013516db | [log] [tgz] |
|---|---|---|
| author | Andre Eisenbach <eisenbach@google.com> | Thu Feb 05 04:38:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 05 04:38:21 2015 +0000 |
| tree | 4a03728029435e4fc12c1f3773d7608dca53fe01 | |
| parent | e791f73202a2832b4d20dbc1ecd4b520adbb75d3 [diff] | |
| parent | d6419cd6309bd20a2ab095c783bb6ad1f208bf4f [diff] |
am d6419cd6: am 0a8c803a: 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 'd6419cd6309bd20a2ab095c783bb6ad1f208bf4f': DO NOT MERGE Change pairing_cb to assume temporary pairing by default