diff options
| author | 2022-06-02 11:22:00 +0000 | |
|---|---|---|
| committer | 2022-06-02 11:22:00 +0000 | |
| commit | 395ca75d005d13f978f89d2b0b17f2b043ca13e0 (patch) | |
| tree | 9682657ce029c9e70239275a428146e2531d563c | |
| parent | 11337c36f7dced541ef512d0b4c87871328d91cd (diff) | |
| parent | 9c58a0fd1549cd110e3f380466bbb7204f98a778 (diff) | |
Merge changes from topic "am-547b842f937f42f486da79c3196bc39d"
* changes:
[automerger skipped] Merge changes from topic "vpnmanager-events-T" into tm-dev am: 839756e661 am: 737ad91307 -s ours
[automerger skipped] Address leftover comments of ag/18112116 am: 29b1b5beac am: fb6bc52da9 -s ours
[automerger skipped] Rename vars of Ikev2VpnRunner am: 09eab9ca43 am: 1c636ee177 -s ours
[automerger skipped] Send VPN manager event when there is a network error am: 41eb56744d am: d44fd2e2dd -s ours
[automerger skipped] Send VPN manager event when there is an IkeProtocolException am: 19f71afa7f am: e0a9f6541e -s ours
0 files changed, 0 insertions, 0 deletions