OSDN Git Service

Merge "Vpn settings per vpn" into nyc-dev
authorVictor Chang <vichang@google.com>
Mon, 21 Mar 2016 13:16:29 +0000 (13:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 Mar 2016 13:16:29 +0000 (13:16 +0000)
commitdcb3f2f3fd0ad10effee66ec8f55416fff61318a
tree963f3a6470f906d11baff670364884bd8c700cb8
parenta4474c7286e3b8386589031d2bd6bd6b336db641
parentdf21cc7de9a6c5543095b0b9eca476b1ff853982
Merge "Vpn settings per vpn" into nyc-dev
am: df21cc7

* commit 'df21cc7de9a6c5543095b0b9eca476b1ff853982':
  Vpn settings per vpn