[automerger skipped] Improve IKEv2/IPsec VPN by proposing more IKE algorithms am: cdd8e19735 am: c430489d5a -s ours

Browse Source

am skip reason: Merged-In Id0983d4b73691b153ee0f1cf3bf63b215098a29a with SHA-1 cdd8e19735 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14687497

Change-Id: I2902edf892bebe38988109301713c257b81fa8ae

...

This commit is contained in:

Yan Yan

2021-05-22 05:30:34 +00:00

committed by Automerger Merge Worker

parent 3253191a87 c430489d5a

commit 3b0d27ebee

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available