Pavel Grafov 18d0de7ecc Merge "Add API for VPN apps to query always-on and lockdown." am: 479c0769f1 am: 5fb1be5c0b ...

am: 43c0ffc1b1

Change-Id: Ied8e5a01cdf76d8da02d2dc292943e6a559cc84e

2019-01-22 07:19:18 -08:00

..

android

Merge "Remove InterfaceController dependency on NMS" am: 06adb08d27 am: b6eb7e19e2

2019-01-22 05:43:59 -08:00

com/android

Merge "Add API for VPN apps to query always-on and lockdown."

2019-01-22 14:43:06 +00:00