| commit | ee6898a4b73d90ebe20bc0218a707d3dc7d6e641 | [log] [tgz] |
|---|---|---|
| author | Matthew Xie <mattx@google.com> | Wed Nov 06 21:53:45 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 06 21:53:45 2013 -0800 |
| tree | 7da9087635cbd72fc393f7750fe8d86ac0e735db | |
| parent | 2a963d9c3c34fa5af76b629160008838317bbb1a [diff] | |
| parent | e56c70f66fc8fd0cbcd97999f6efe187049c062c [diff] |
am e56c70f6: am cd68000c: Merge "cancel device discovery before start pairing process" into klp-dev * commit 'e56c70f66fc8fd0cbcd97999f6efe187049c062c': cancel device discovery before start pairing process