| commit | e56c70f66fc8fd0cbcd97999f6efe187049c062c | [log] [tgz] |
|---|---|---|
| author | Matthew Xie <mattx@google.com> | Wed Nov 06 21:51:44 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 06 21:51:44 2013 -0800 |
| tree | f5bd54afc95a66143a07cb6f098d174fa25219a7 | |
| parent | 0b98b9933f0a2523ad333136777ef42982afc53a [diff] | |
| parent | cd68000c2c9eb487a4bdb718d966a3246fef4d59 [diff] |
am cd68000c: Merge "cancel device discovery before start pairing process" into klp-dev * commit 'cd68000c2c9eb487a4bdb718d966a3246fef4d59': cancel device discovery before start pairing process