Skip to content
Commit 04992800 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 am: 33f08103 

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

Change-Id: I1e72d91a232e4c54782e69c4c20142efefc53873
parents 2d810df8 33f08103
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