OSDN Git Service

Merge "Support VPN Proxy(2/2)" am: 2a695c4b7b am: e2f74af063
authorChalard Jean <jchalard@google.com>
Sat, 9 Mar 2019 12:20:32 +0000 (04:20 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 9 Mar 2019 12:20:32 +0000 (04:20 -0800)
commit230a9949b4d4c99632e2e5115610e13098006462
treed5777b34f793ea66bc14ed2d5a45501f69a57dbd
parente3adfc10a7472df55cb038acd0c3b4d5928166cc
parentaa5d185d7bf7a49a7f35093896adcbf15bbf384c
Merge "Support VPN Proxy(2/2)" am: 2a695c4b7b am: e2f74af063
am: aa5d185d7b

Change-Id: Ifa4ac76f78e24296a29f99f5733075651bed9072
res/values/arrays.xml
src/com/android/settings/vpn2/ConfigDialog.java