OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bbcd593
1679e90
)
Merge "VPN: increase timeout period to 60 seconds for legacy VPN."
author
Chia-chi Yeh
<chiachi@android.com>
Sat, 23 Jul 2011 00:14:50 +0000
(17:14 -0700)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Sat, 23 Jul 2011 00:14:50 +0000
(17:14 -0700)
Trivial merge