Skip to content
Commit f3af46a6 authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "Include PORT_4500 option when encoding IkeSessionParams" am: c65ed07b... 

Merge "Include PORT_4500 option when encoding IkeSessionParams" am: c65ed07b am: 33f08103 am: 04992800

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

Change-Id: Id235ce1f89dc48a3cf3ad26ea0217573cc1aa708
parents c29e57fb 04992800
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