commit | d3bda5358c7bfdf202e421ebaa5a7644e33a9b18 | [log] [tgz] |
---|---|---|
author | Yan Yan <evitayan@google.com> | Thu Apr 18 19:15:40 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 18 19:15:40 2024 +0000 |
tree | 9b5423f43d7bbd8e9e3bc2df69f5b917d98309f1 | |
parent | b076162f3cf4ec5a39d28a544822d8c1ac6492bf [diff] | |
parent | 06c8369cf78c6c1eb469d916ba00bbb65fd22330 [diff] |
Merge "Encode IkeSessionParams using getIkeOptions" into main am: ade571062f am: 06c8369cf7 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3045554 Change-Id: I8ce5095cdddc8885c1b41b28475ba40fab0b796d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>