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

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

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



Change-Id: I8ca1b147d80793e5c082ce45bb43d75f92cbde0d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 273933cf dd76f4b3
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