Merge changes from topic "am-547b842f937f42f486da79c3196bc39d"

Browse Source

* 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

...

This commit is contained in:

Automerger Merge Worker

2022-06-02 11:22:00 +00:00

committed by Android (Google) Code Review

parent 11337c36f7 9c58a0fd15

commit 395ca75d00

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available