| commit | 0ad6cfdee8857a7bc54d4c3eb98bf1cdc82dc9a7 | [log] [tgz] |
|---|---|---|
| author | Andre Eisenbach <eisenbach@google.com> | Thu Feb 05 02:24:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 05 02:24:38 2015 +0000 |
| tree | 4a03728029435e4fc12c1f3773d7608dca53fe01 | |
| parent | 17d854067162e27c2bf67fd61454ae7b76b79cea [diff] | |
| parent | ce5ae4abddaab8865bb44c83d2d44e14b0d7536b [diff] |
am ce5ae4ab: am a708936d: DO NOT MERGE Change pairing_cb to assume temporary pairing by default * commit 'ce5ae4abddaab8865bb44c83d2d44e14b0d7536b': DO NOT MERGE Change pairing_cb to assume temporary pairing by default