tree 72bf007b8cdb00796aa0d993a6363bce30613804
parent ac2c6d5d66ad43d4c0838aabe863b92ba650bf5c
parent 0494b21fc9dca0e2634832e45ec1939d0d9ac8cc
author Xin Li <delphij@google.com> 1644611654 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1644611654 +0000

[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 0494b21fc9 -s ours

am skip reason: Merged-In Ie3d45ef7783bb656f988a5015ad943035ec929e6 with SHA-1 b4d6d4f5f1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ipsec-tools/+/16843232

Change-Id: Icc45d652194d934f0c03708e2e77997e66e9f30d