OSDN Git Service

Merge "VPN: increase timeout period to 60 seconds for legacy VPN."
authorChia-chi Yeh <chiachi@android.com>
Sat, 23 Jul 2011 00:14:50 +0000 (17:14 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 23 Jul 2011 00:14:50 +0000 (17:14 -0700)

Trivial merge