From: TreeHugger Robot Date: Sat, 22 Oct 2016 02:23:04 +0000 (+0000) Subject: Merge "Fix vpn branded string usage" into nyc-mr1-dev X-Git-Tag: android-x86-7.1-r1~684^2~3 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9db47b0f497f8489db408c36a82f8118f43d6566;p=android-x86%2Fframeworks-base.git Merge "Fix vpn branded string usage" into nyc-mr1-dev --- 9db47b0f497f8489db408c36a82f8118f43d6566