OSDN Git Service

am 2df1cc43: Merge change I42a80783 into eclair
authorHung-ying Tyan <tyanh@google.com>
Wed, 30 Sep 2009 10:50:30 +0000 (03:50 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Sep 2009 10:50:30 +0000 (03:50 -0700)
commit4c0d406d56894037df7669064e1d67b4f51cdb6d
treef23039914a2d3dfa41807a68591c7814d326d196
parent2f208646ebe7579c2b8694c66d55f8c883df0ec3
parent2df1cc437793d50609c575881c04cc2c63d0bd97
am 2df1cc43: Merge change I42a80783 into eclair

Merge commit '2df1cc437793d50609c575881c04cc2c63d0bd97' into eclair-plus-aosp

* commit '2df1cc437793d50609c575881c04cc2c63d0bd97':
  Remove deprecated VpnType.getDescription().