tree d34f74a48086e477077154ed770678694d650160
parent 0e0b0c684844a65c3cf840207487640c0fa701e8
parent c65ed07b59596746555eab0cb525ad515735b7b9
author Yan Yan <evitayan@google.com> 1619029479 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619029479 +0000

Merge "Include PORT_4500 option when encoding IkeSessionParams" am: c65ed07b59

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

Change-Id: I60b4b5dea3b2f745803199a410cf013ef6e0c333