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

Skip to content
Commit 2194a62f 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 am: 3caa3cf3 

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



Change-Id: I7d3a2631cd70a342e7f224fcd99ec8eb1e2c77d9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 70a2f0ce 3caa3cf3
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