| commit | 75cf48c8f0fe7f6fefc064b0d2937d78916bfb5c | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Mon Aug 22 18:50:01 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 22 18:50:01 2022 +0000 |
| tree | 1444087162fca48da9b6adb67ee75de1afd145de | |
| parent | 9c23ef9991d68d48a6d0a8051e528dba7ede2bf9 [diff] | |
| parent | e6a6d58fa2734376a8826f5afc2ad507043fd89f [diff] |
Merge "Add three new IKE options in IkeSessionParamsUtils" am: dd4f288e31 am: e6a6d58fa2 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2191196 Change-Id: I0a11dd2435bb52c58e43d6a1cea8745c13f0ff84 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>