OSDN Git Service

Merge "Vpn settings per vpn" into nyc-dev am: df21cc7
authorVictor Chang <vichang@google.com>
Mon, 21 Mar 2016 13:18:51 +0000 (13:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 Mar 2016 13:18:51 +0000 (13:18 +0000)
commit3ea5630690af1cbd1b314ae47901f8b5e21dba4a
tree6d44b6253d35db26fd7fc5577edcd0ba04ddf2c4
parent8b64b1a65ab14a4ca27664cdea7ff2113b98e6e1
parentdcb3f2f3fd0ad10effee66ec8f55416fff61318a
Merge "Vpn settings per vpn" into nyc-dev am: df21cc7
am: dcb3f2f

* commit 'dcb3f2f3fd0ad10effee66ec8f55416fff61318a':
  Vpn settings per vpn