OSDN Git Service

(root) / android-x86 / external-wpa_supplicant_8.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45bbe82 a2854ab)
am a2854abb: wpa_supplicant: Postpone P2P scan if usual scan is in progress
authorDmitry Shmidt <dimitrysh@google.com>
Tue, 11 Sep 2012 00:16:47 +0000 (17:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Sep 2012 00:16:47 +0000 (17:16 -0700)
* commit 'a2854abb63b41c123e4c78e5653a55d902f00be6':
  wpa_supplicant: Postpone P2P scan if usual scan is in progress


Trivial merge
external/wpa_supplicant_8
About OSDN
Find Software
Develop Software
Help