Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3bda535 authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "Encode IkeSessionParams using getIkeOptions" into main am: ade57106 am: 06c8369c 

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



Change-Id: I8ce5095cdddc8885c1b41b28475ba40fab0b796d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b076162f 06c8369c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment