Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 8355b8cf authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" am:... 

Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" am: 48160f9b am: 3caa3cf3 am: 2194a62f am: 4319575d am: 50f0f08f am: 61d73d1d

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



Change-Id: I6a3ae0a0ed2dbf70dd82c7a8d20035e901cb1126
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 16054ddc 61d73d1d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment