From: Robin Lee <rgl@google.com>
Date: Thu, 25 Jun 2015 22:27:54 +0000 (+0000)
Subject: Merge "Enable VPN settings for secondary users" into mnc-dev
X-Git-Tag: android-x86-6.0-r1~310
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f04bcebd;p=android-x86%2Fpackages-apps-Settings.git

Merge "Enable VPN settings for secondary users" into mnc-dev
---

f04bcebd4e9fdc3323c492059d107043e4d8109a