OSDN Git Service

am c91d2cd0: Merge "Put VPN settings under primary profile control" into lmp-dev
authorZoltan Szatmary-Ban <szatmz@google.com>
Thu, 4 Sep 2014 12:45:17 +0000 (12:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Sep 2014 12:45:17 +0000 (12:45 +0000)
* commit 'c91d2cd082b5b682bb957085862b54431485f43a':
  Put VPN settings under primary profile control


Trivial merge