| commit | 33f08103fab2ab81eed20c51a0a465778945fd26 | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Wed Apr 21 18:24:39 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 21 18:24:39 2021 +0000 |
| tree | d34f74a48086e477077154ed770678694d650160 | |
| parent | 0e0b0c684844a65c3cf840207487640c0fa701e8 [diff] | |
| parent | c65ed07b59596746555eab0cb525ad515735b7b9 [diff] |
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