Hung-ying Tyan 4c0d406d56 am 2df1cc43: Merge change I42a80783 into eclair
Merge commit '2df1cc437793d50609c575881c04cc2c63d0bd97' into eclair-plus-aosp

* commit '2df1cc437793d50609c575881c04cc2c63d0bd97':
  Remove deprecated VpnType.getDescription().
2009-09-30 03:50:30 -07:00
..