| commit | 4ff7838d595d2be641da1892507d3333707291e2 | [log] [tgz] |
|---|---|---|
| author | Prem Kumar <premk@google.com> | Sun Dec 14 19:53:06 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sun Dec 14 19:53:08 2014 +0000 |
| tree | 3852cf3d431bc1bcce5420eb458e4770370b4741 | |
| parent | e97752385ec67e72f8ae7a772eb7af3014266ace [diff] | |
| parent | a1c02f0a73ee35e198e2652cd65b8830a163d9dd [diff] |
Merge "autojoin scanning + P2P - discard autojoin scan when both infra and P2P are connected - reduce autojoin scan period when P2P is connected and infra is disconnected Bug:18692653" into lmp-mr1-dev