Lorenzo Colitti 29e36cb8c8 Merge "Fix legacy APIs when VPN switches to suspended underlying network." am: 83563fd735 am: d892e45c9b am: edd29a2f23 ...

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547497

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I21c1c7913987a2bb4d486e6ce8da24a76ddf2dc6

2021-01-28 08:06:46 +00:00

..

android

Merge changes I713bc2ec,Ib9ab07c9

2021-01-26 13:13:24 +00:00

com/android

Merge "Fix legacy APIs when VPN switches to suspended underlying network." am: 83563fd735 am: d892e45c9b am: edd29a2f23

2021-01-28 08:06:46 +00:00