| commit | ce5ae4abddaab8865bb44c83d2d44e14b0d7536b | [log] [tgz] |
|---|---|---|
| author | Andre Eisenbach <eisenbach@google.com> | Thu Feb 05 02:11:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 05 02:11:12 2015 +0000 |
| tree | 1ac6b887346cb26a471dac7879759087d8819f31 | |
| parent | cf7f6a154aed48659260d391994dc59151be937b [diff] | |
| parent | a708936da347b32f2a0811b5f33d9068c2b0de6f [diff] |
am a708936d: DO NOT MERGE Change pairing_cb to assume temporary pairing by default * commit 'a708936da347b32f2a0811b5f33d9068c2b0de6f': DO NOT MERGE Change pairing_cb to assume temporary pairing by default