From: Jeff Davidson <jpd@google.com>
Date: Wed, 20 Aug 2014 23:59:30 +0000 (+0000)
Subject: Merge "Less intrusive VPN dialog." into lmp-dev
X-Git-Tag: android-x86-6.0-r1~860^2~523
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4e064343b35cfa6a7615e453c1f6bcf96397e414;p=android-x86%2Fpackages-apps-Settings.git

Merge "Less intrusive VPN dialog." into lmp-dev
---

4e064343b35cfa6a7615e453c1f6bcf96397e414