OSDN Git Service

am 34e537ed: am c91d2cd0: Merge "Put VPN settings under primary profile control"...
authorZoltan Szatmary-Ban <szatmz@google.com>
Mon, 15 Sep 2014 23:55:14 +0000 (23:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Sep 2014 23:55:14 +0000 (23:55 +0000)
* commit '34e537ed277415530c4a811bfcd9a27a3f17bd00':


Trivial merge