OSDN Git Service

Manual merge of b273b20c
authorJean-Baptiste Queru <jbq@google.com>
Fri, 8 Oct 2010 14:41:45 +0000 (07:41 -0700)
committerJean-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