| commit | 7915a8e189fd2287ece38badf694424808ed5e40 | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Fri May 21 23:13:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 21 23:13:32 2021 +0000 |
| tree | 46b39082e6348af482cee79e97679d85e09d3f5a | |
| parent | f8a3b98311d6f6e0876556d0c38d071345d1da40 [diff] | |
| parent | 80ddfb47cd88f1b1f4a4999b982b72d2e36b81ae [diff] |
Merge "Improve IKEv2/IPsec VPN by proposing more IPsec algorithms" am: 5cb9e37a55 am: 10f4456e79 am: 80ddfb47cd Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690265 Change-Id: Id1dc3b15c495b5ab2a3578286bdb6ad57f647a29