OSDN Git Service

Merge "VpnDialogs should be able to control always-on VPN." am: d5d7492040
authorPavel Grafov <pgrafov@google.com>
Wed, 30 Jan 2019 20:13:46 +0000 (12:13 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 Jan 2019 20:13:46 +0000 (12:13 -0800)
commitc97f2a7c714a02983f1ab57e02725ab32c5bb701
tree900f1a2d224bfc6024b09fa72858e3632a77f63f
parent072ca6f94d939d54a0f0df3519494947d3ac4680
parent09aa059ec43bd79b334c03d3ddbc74adc49624ed
Merge "VpnDialogs should be able to control always-on VPN." am: d5d7492040
am: 09aa059ec4

Change-Id: I3d2f5c5a7bc199551aad1ddb656dc076e3121fb3