commit | 93ca92725e5595f99c0e99a056e94515eda6c59c | [log] [tgz] |
---|---|---|
author | Yan Yan <evitayan@google.com> | Mon Dec 07 21:36:34 2020 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Dec 07 21:36:34 2020 +0000 |
tree | bc3b14c9af2baee2c13c7e90714a4a0d7cb9a323 | |
parent | b1f99fecbde3bb55d29b4929a2327e0d4871bfcd [diff] | |
parent | 0ef519d860e9672531b5d1ca09a3482be0ad1bbc [diff] |
Merge changes Id4b6122a,Ibac47013 * changes: Switch to port 4500 if both NAT-T and MOBIKE are supported Support injecting ConnectivityManager to IkeNattKeepalive