OSDN Git Service

am 82e047b1: am 91c40cdc: wpa_supplicant: P2P-related fixes
authorDmitry Shmidt <dimitrysh@google.com>
Tue, 25 Sep 2012 22:34:23 +0000 (15:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Sep 2012 22:34:23 +0000 (15:34 -0700)
* commit '82e047b15c0e3a5935cef15fe6461633db5d3ab4':
  wpa_supplicant: P2P-related fixes


Trivial merge