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