commit | ab01d9630c48257621156b71045b77deecfd4ae5 | [log] [tgz] |
---|---|---|
author | Yan Yan <evitayan@google.com> | Mon Aug 22 20:03:10 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 22 20:03:10 2022 +0000 |
tree | 12fa1b78f562035032ef541aaecbd3fcacdceb20 | |
parent | 94fbcc50a17ae830994080f1580f433221179db9 [diff] | |
parent | 895b372f7721adf6d162ec894a42a590726aa1c1 [diff] |
Merge "Add three new IKE options in IkeSessionParamsUtils" am: dd4f288e31 am: e6a6d58fa2 am: 75cf48c8f0 am: 895b372f77 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2191196 Change-Id: If662b5a81abd32ac4afc09deced48ea0fceb4c57 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>