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