tree 624e99f17bd98e345a5c582b82626e7e7350e511
parent 614733dab6eb39ae14508c49310787bfcd3c1238
parent 1c2ee40dcd39154b56f69a7189dfc46e9b093f24
author Pavel Grafov <pgrafov@google.com> 1548885309 -0800
committer android-build-merger <android-build-merger@google.com> 1548885309 -0800

Merge "CTS test for VpnService.isAlwaysOn & .isLockdownEnabled." am: 30667cf8c0 am: ec4f77d275
am: 1c2ee40dcd

Change-Id: I6416bb47b1793995155c41dfa9728615e78b9418