c7c6bbacb8
Merge commit 'f2bd901738736e16ea93f0a4c7275f2141ca3a3e' into eclair-plus-aosp * commit 'f2bd901738736e16ea93f0a4c7275f2141ca3a3e': make vpn type strings i18n ready.