| commit | 6817cb01ac580b934161c15a625614e8debdec48 | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Fri Aug 19 23:03:21 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 19 23:03:21 2022 +0000 |
| tree | 689e645dc1d257f713332a99b946b32cebba92f5 | |
| parent | 664672f40f0ba137f9852527a1be54ca92117d4d [diff] | |
| parent | 3f7609bf0c9fb88f4a1117b80ee136a4b0bc47ed [diff] |
Merge "Revert "Add three new IKE options in IkeSessionParamsUtils"" am: c271a2da6a am: 9c20b1ede6 am: 92ac8f2ac9 am: 3f7609bf0c Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2190278 Change-Id: If7deb604569351e2ed4f054f259642f181e346cf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>