Merge "Set SPI Allocation Timeout to One Hour" am: 78ca1fecef

am: 3c7b751619

Change-Id: I9c8ca2e5019a380fc45621b148c9b2e950d01987
This commit is contained in:
Benedict Wong 2018-03-16 21:10:28 +00:00 committed by android-build-merger
commit 061dbd188d

View file

@ -576,6 +576,9 @@ on boot
hostname localhost
domainname localdomain
# IPsec SA default expiration length
write /proc/sys/net/core/xfrm_acq_expires 3600
# Memory management. Basic kernel parameters, and allow the high
# level system server to be able to adjust the kernel OOM driver
# parameters to match how it is managing things.