| commit | da4d4b1629f27ec8431915d14ea649145845351f | [log] [tgz] |
|---|---|---|
| author | Chia-chi Yeh <chiachi@android.com> | Fri Jul 22 17:14:50 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 22 17:14:50 2011 -0700 |
| tree | 88ded83d9598727cd20fbce1c26b638fbfbb5f91 | |
| parent | bbcd5930c56cf087854cd54750d1de06de15d319 [diff] | |
| parent | 1679e909eba77e8a1673bf44aa3180c781c0e632 [diff] |
Merge "VPN: increase timeout period to 60 seconds for legacy VPN."