| commit | 9c20b1ede60cb280f521d627fb1e265f5a05c44e | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Fri Aug 19 21:51:05 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 19 21:51:05 2022 +0000 |
| tree | d2c9be7c6e2da429a567733695e2f43d7369c2e6 | |
| parent | f214872067544f53a35d023d181ce1e236fae8c1 [diff] | |
| parent | c271a2da6aaf1895781538400aba4aec7e7390b8 [diff] |
Merge "Revert "Add three new IKE options in IkeSessionParamsUtils"" am: c271a2da6a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2190278 Change-Id: Ic2b73f386c54a55e5f451092c86ce052d7585bf7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>