commit | 895b372f7721adf6d162ec894a42a590726aa1c1 | [log] [tgz] |
---|---|---|
author | Yan Yan <evitayan@google.com> | Mon Aug 22 19:27:09 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 22 19:27:09 2022 +0000 |
tree | e46a2e4b0590193b9f5f5f1cbea8ce79d3ee2973 | |
parent | 6919452a3b50faa34ba771a81543a6fff795dc15 [diff] | |
parent | 75cf48c8f0fe7f6fefc064b0d2937d78916bfb5c [diff] |
Merge "Add three new IKE options in IkeSessionParamsUtils" am: dd4f288e31 am: e6a6d58fa2 am: 75cf48c8f0 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2191196 Change-Id: I22a9da501e374ca3602f641eb13f27874399de1e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>