commit | 8ee3575ab863a7e9fd38c6ff9ae29a34a200ca8d | [log] [tgz] |
---|---|---|
author | Benedict Wong <benedictwong@google.com> | Tue Apr 28 18:17:10 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 28 18:17:10 2020 +0000 |
tree | 0f20967c94a4c2428a3a8c5d5d5385ac47f43ce9 | |
parent | edd659040c17d0c2d48fd8b7115b5b48ab9f0330 [diff] | |
parent | ebb01b6fd82325f51460557d052e6bdb49eed087 [diff] |
Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" am: 7e37275b05 am: ebb01b6fd8 Change-Id: I7ef93d318b795754eea3511caf7c3ae9187a88b2