OSDN Git Service
(root)
/
android-x86
/
external-ppp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
35003ca
b273b20
)
Manual merge of b273b20c
author
Jean-Baptiste Queru
<jbq@google.com>
Fri, 8 Oct 2010 14:41:45 +0000
(07:41 -0700)
committer
Jean-Baptiste Queru
<jbq@google.com>
Fri, 8 Oct 2010 14:41:49 +0000
(07:41 -0700)
"am
a96c501e
: Mark ip-up-vpn as optional"
Change-Id: I6bb8a4ac696ebb2ba24895698ff0a853117ab769
Trivial merge