tree 3d8d63b373717de32103af1630dc9cc8b5b75b86
parent c9f2a6428a18a942684d353914f62a8a12603b72
parent fa08f9eb31989e0973eb8ed0bd14c238be19ab0b
author Jouni Malinen <j@w1.fi> 1347657233 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347657233 -0700

am fa08f9eb: P2P: Schedule new scan if P2P operation delays scan

* commit 'fa08f9eb31989e0973eb8ed0bd14c238be19ab0b':
  P2P: Schedule new scan if P2P operation delays scan