OSDN Git Service

am 8fd062e1: Use the new VpnType.getDescriptionId().
authorHung-ying Tyan <tyanh@google.com>
Wed, 30 Sep 2009 10:06:58 +0000 (03:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Sep 2009 10:06:58 +0000 (03:06 -0700)
commit39087f8a69ab224f3b067bb79e5cd66fd5e2a3aa
tree45b87f6dbfd49cc70a29b4fa3fe56d0d6762b85d
parent9c06c4b2df16042ca09e4f51c4a86bdb595258de
parent8fd062e1a5c0047deff1dd817a097b94891000f2
am 8fd062e1: Use the new VpnType.getDescriptionId().

Merge commit '8fd062e1a5c0047deff1dd817a097b94891000f2' into eclair-plus-aosp

* commit '8fd062e1a5c0047deff1dd817a097b94891000f2':
  Use the new VpnType.getDescriptionId().