| commit | 3caa3cf399e27750bbc9bd21ccfad92474e58a2e | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Thu Apr 07 10:38:03 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 07 10:38:03 2022 +0000 |
| tree | 24a0c78a83a28764b13d06671096eab7829206d3 | |
| parent | 8cd8c8c8ec4bdd5c93e588937accdf20459f2eae [diff] | |
| parent | 48160f9b9b7080bcf9d9a9d9d3720fb0c0262df9 [diff] |
Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" am: 48160f9b9b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978249 Change-Id: I3595e032cff0b18959150139d9f84cb817784fb2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>