commit | 011867ce78020fbad09a519d1c45bd329aefe811 | [log] [tgz] |
---|---|---|
author | Cody Kesting <ckesting@google.com> | Tue Dec 15 19:28:14 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 15 19:28:14 2020 +0000 |
tree | 8573423fa244cd76b1cdf5c285025f6aaa46d8a1 | |
parent | 6f9c81a185b9add44eabd0ae306a67f7aa8228c0 [diff] | |
parent | c94188bae164c19f8a9786aaba545647906650c7 [diff] |
Merge "Allow NATT Keepalive delay to be configured." am: 94e43f81c8 am: c94188bae1 Original change: https://android-review.googlesource.com/c/platform/packages/modules/IPsec/+/1526848 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icf433f0663098ccf7b5393119f122328b296172b