tree 5cc81f590103af66e923e05788351e7acd07b4bc
parent e61519b4a541a4262389842ae8b72dac401b2199
parent 7666c912b820e61c58b57ad691b4b3babca9fbf9
author Prem Kumar <premk@google.com> 1413662163 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413662163 +0000

am 7666c912: Merge "set autojoin associated scan frequency to 20 seconds" into lmp-dev

* commit '7666c912b820e61c58b57ad691b4b3babca9fbf9':
  set autojoin associated scan frequency to 20 seconds