Skip to content
Commit 3481e842 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: 325527e2 am: 0792817c 

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



Change-Id: I715e9c1af78b679058699d10cd39fe55a0dc652f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e75c1a26 0792817c
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