| commit | c5aa76112eb8c69e76b25d3f4b7c6cb1f56d74c6 | [log] [tgz] |
|---|---|---|
| author | Jouni Malinen <jouni@qca.qualcomm.com> | Fri Jul 19 15:48:26 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 19 15:48:26 2013 -0700 |
| tree | a0d4d58bb7fd20dc3a678bf5e4bec4d31982b11a | |
| parent | 33dcfd56d86438bc8ca83bc74d97874880e584fe [diff] | |
| parent | 82c2c2331d5d0bccf5d49f03347c9a23285a305b [diff] |
am 82c2c233: (-s ours) am 26a545dc: Do not try auto connect mechanism in disconnected state, DO NOT MERGE * commit '82c2c2331d5d0bccf5d49f03347c9a23285a305b': Do not try auto connect mechanism in disconnected state, DO NOT MERGE