| commit | ae9d174bc0afe0a7ed0bb4fb82836338fbb6adb1 | [log] [tgz] |
|---|---|---|
| author | Andre Eisenbach <eisenbach@google.com> | Thu Feb 05 04:01:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 05 04:01:12 2015 +0000 |
| tree | 1ac6b887346cb26a471dac7879759087d8819f31 | |
| parent | ce5ae4abddaab8865bb44c83d2d44e14b0d7536b [diff] | |
| parent | 408dec1991255be919b1605e5cfe983b7f7154e9 [diff] |
am 408dec19: am 977acabd: (-s ours) am eebc8ab9: DO NOT MERGE Change pairing_cb to assume temporary pairing by default * commit '408dec1991255be919b1605e5cfe983b7f7154e9': DO NOT MERGE Change pairing_cb to assume temporary pairing by default