OSDN Git Service
(root)
/
android-x86
/
external-wpa_supplicant_8.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
eb0cf91
b6dcd87
)
am b6dcd87a: am fa08f9eb: P2P: Schedule new scan if P2P operation delays scan
author
Jouni Malinen
<j@w1.fi>
Mon, 17 Sep 2012 18:29:23 +0000
(11:29 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 17 Sep 2012 18:29:23 +0000
(11:29 -0700)
* commit '
b6dcd87ac380d00848401633090a0a7f36e61e10
':
P2P: Schedule new scan if P2P operation delays scan
Trivial merge