| commit | a7cb8254943163606aa9339a0a8ba8930c7cafd9 | [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 | dd9fd915a70f8650a9b7855b883550e303b330e6 | |
| parent | 54c29cf1d1149549ace5398bc3a3fd4002abda88 [diff] | |
| parent | 7ef8611b5f3a893a46c7b9e22bdd8ab252e373ff [diff] |
Merge "VPN: increase timeout period to 60 seconds for legacy VPN."