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