tree 868bb8f90b25a84990e77b7132c9833d3ac3af9d
parent 965547b3181cfb0ecc38df44f2d57ae3b9e81619
parent bc4193971a163e144967531968bf7d9be4d96fbe
author Yan Yan <evitayan@google.com> 1621637628 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1621637628 +0000

Merge "Improve IKEv2/IPsec VPN by proposing more IPsec algorithms" am: bc4193971a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690265

Change-Id: I8b8a423b093f5a8696e43afbdac0cbb555dd4aff