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