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

Skip to content
Commit fed00029 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Add the IP version and encap type to IkeSessionParamsUtils." am:... 

Merge "Add the IP version and encap type to IkeSessionParamsUtils." am: 325527e2 am: 0792817c am: 3481e842 am: dd76f4b3 am: 2b5f2373

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



Change-Id: Idff0c27de7696b267911bafa8512724c90b7604d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 85e808f1 2b5f2373
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