tree 26a7c98b7201c914bd249fee6dcd06921c95789f
parent 1c66fd2d677ce749dfddfba93c15305d6eca89ee
parent b29205728283e260893f48fcef6263369f2f0949
author Benedict Wong <benedictwong@google.com> 1543201456 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1543201456 +0000

Merge changes from topic "xfrmi-support"

* changes:
  Cleanup and update comments SA mark disabling comments
  Add XFRM-I support to IpSecService
  Disable attempted updating of SA marks