tree b58f845505fc3e3d3e310b81509e1134a1011e3a
parent e6ce589266deddd541fe728a13dc97d661a7c121
parent aa532510a7b8c4da2d7d6e2c11dda5db840894e4
author Dmitry Shmidt <dimitrysh@google.com> 1348513263 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348513263 -0700

am aa532510: wpa_supplicant: P2P-related fixes

* commit 'aa532510a7b8c4da2d7d6e2c11dda5db840894e4':
  wpa_supplicant: P2P-related fixes