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

Skip to content
Commit 3caa3cf3 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: 48160f9b 

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



Change-Id: I3595e032cff0b18959150139d9f84cb817784fb2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8cd8c8c8 48160f9b
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