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