Merge "Set SPI Allocation Timeout to One Hour"

am: 78ca1fecef

Change-Id: I1919dd54d7c64e8a58f6397145e605ec1eb8c356
This commit is contained in:
Benedict Wong 2018-03-16 20:43:23 +00:00 committed by android-build-merger
commit 3c7b751619

View file

@ -573,6 +573,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.