| commit | 3481e8423de1fdb57257ad8f1bae434b73661dbc | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Fri Feb 17 06:22:03 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 17 06:22:03 2023 +0000 |
| tree | 369856a27d1c290069a1c7c605eb4ed16420260b | |
| parent | e75c1a2633450f69e9cf4a859643a069a76097e9 [diff] | |
| parent | 0792817c6bd4dfb28e1163d0eb791e4c98b34c9a [diff] |
Merge "Add the IP version and encap type to IkeSessionParamsUtils." am: 325527e280 am: 0792817c6b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2435234 Change-Id: I715e9c1af78b679058699d10cd39fe55a0dc652f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>