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