OSDN Git Service

Merge "VpnSettings: make more fields available as advanced options."
authorChia-chi Yeh <chiachi@android.com>
Thu, 28 Jul 2011 01:35:44 +0000 (18:35 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 28 Jul 2011 01:35:44 +0000 (18:35 -0700)
1  2 
res/values/strings.xml

Simple merge