4c0d406d56
Merge commit '2df1cc437793d50609c575881c04cc2c63d0bd97' into eclair-plus-aosp * commit '2df1cc437793d50609c575881c04cc2c63d0bd97': Remove deprecated VpnType.getDescription().