From: Zoltan Szatmary-Ban <szatmz@google.com>
Date: Thu, 4 Sep 2014 12:45:17 +0000 (+0000)
Subject: am c91d2cd0: Merge "Put VPN settings under primary profile control" into lmp-dev
X-Git-Tag: android-x86-6.0-r1~671^2~691^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c465867bde16b7e1fe6c6d3e6d33031a266e6aea;p=android-x86%2Fpackages-apps-Settings.git

am c91d2cd0: Merge "Put VPN settings under primary profile control" into lmp-dev

* commit 'c91d2cd082b5b682bb957085862b54431485f43a':
  Put VPN settings under primary profile control
---

c465867bde16b7e1fe6c6d3e6d33031a266e6aea