commit | 617ae9e1479e4a3d58d763bb0e393ba159e0bfe2 | [log] [tgz] |
---|---|---|
author | Benedict Wong <benedictwong@google.com> | Thu Apr 30 17:40:38 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 30 17:40:38 2020 +0000 |
tree | d6e93a2fa17cbb74440c04096e97fac74d612821 | |
parent | 19082fb048622a51295209a08bd26c71fd8b5038 [diff] | |
parent | b3ce2bb0503e57fe1cdf9d7f0fd372e4f28742f0 [diff] |
[automerger skipped] Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev am: b3ce2bb050 -s ours am skip reason: Change-Id I7e61a1612692db275b751330af5bacbf86836a8c with SHA-1 e2a2a10e93 is in history Change-Id: I91f2a1820666357bffc974b0eab4e156e5d011a5