OSDN Git Service

Merge "Vpn settings per vpn" into nyc-dev
authorVictor Chang <vichang@google.com>
Mon, 21 Mar 2016 13:09:07 +0000 (13:09 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 21 Mar 2016 13:09:07 +0000 (13:09 +0000)
1  2 
res/values/strings.xml

Simple merge