OSDN Git Service

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


Trivial merge