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

Skip to content
Commit 3f5a343f 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

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



Change-Id: If09fe0cfa513efd6f61d45faa19ba98c2435c1a1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0b9d40af 2194a62f
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment