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:
62b90b3
d350192
)
resolved conflicts for merge of d3501922 to master
author
Ying Wang
<wangying@google.com>
Wed, 21 Nov 2012 20:28:46 +0000
(12:28 -0800)
committer
Ying Wang
<wangying@google.com>
Wed, 21 Nov 2012 20:28:46 +0000
(12:28 -0800)
Change-Id: I1a934ce39a06fa30d3461b19cfe375400642ea4b
Trivial merge