| commit | 04992800bd46b46d0ad882f3752ac6e10066fcd2 | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Wed Apr 21 19:01:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 21 19:01:55 2021 +0000 |
| tree | 12b1f5eee6e0809ff498329d9486f91af4f05766 | |
| parent | 2d810df8eb9abbe4c3ecceecc3b643b7b7994f4f [diff] | |
| parent | 33f08103fab2ab81eed20c51a0a465778945fd26 [diff] |
Merge "Include PORT_4500 option when encoding IkeSessionParams" am: c65ed07b59 am: 33f08103fa Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682405 Change-Id: I1e72d91a232e4c54782e69c4c20142efefc53873