Pavel Grafov 1ad4ef9385 Merge "Add API for VPN apps to query always-on and lockdown." am: 5e135e2bdc am: d332a50c1f ...

am: 8bfc3feb3f

Change-Id: Ied8e5a01cdf76d8da02d2dc292943e6a559cc84e

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

..

android

Merge changes I2ddfef0c,I49bee0c9 am: 1feafc2e2a am: ae62bfc346

2019-01-21 11:28:55 -08:00

com/android

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

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