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

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



Change-Id: I799ab7a7a4153e405488efe7f486c9bbcf98983b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1a078491 3481e842
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