tree e4541ba147f13264f6133047b9dd456abca2adfc
parent be49b65d154125a04c96d4e77994dbbb19e2cd67
parent 4e645f30a9103487e4807f5eb36db9d1098fcf60
author Treehugger Robot <treehugger-gerrit@google.com> 1557452546 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1557452546 +0000

Merge changes Ibff278a6,If6d537a3

* changes:
  Revert "Add NATT keepalive resources and methods into IpSecService"
  Revert "[KA11] Verify fd ownership and allocate resource for NattKeepalive"