tree 80af947b0dd28ba555bab2c7069f0545d6840b46
parent c85174ba3d9cb378c33121ba6c08012af28e5798
parent fb36d44462f3aefb8fa7a4115917d2c79b7b03b5
author Junyu Lai <junyulai@google.com> 1556006919 -0700
committer android-build-merger <android-build-merger@google.com> 1556006919 -0700

Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive"
am: fb36d44462

Change-Id: I2f5e0e11494866b054668c9224a8732cd8c035f9