OSDN Git Service

am 39087f8a: am 8fd062e1: Use the new VpnType.getDescriptionId().
authorHung-ying Tyan <tyanh@google.com>
Thu, 1 Oct 2009 18:55:05 +0000 (11:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Oct 2009 18:55:05 +0000 (11:55 -0700)
commitb25e22be8a33c6d9acf842704933e22898d36d74
tree2c3345e7ce39a8525cd39fadede76f68a1bdbb88
parent28c6e2e9629fc91b9a440e816f1ad424a338baca
parent39087f8a69ab224f3b067bb79e5cd66fd5e2a3aa
am 39087f8a: am 8fd062e1: Use the new VpnType.getDescriptionId().

Merge commit '39087f8a69ab224f3b067bb79e5cd66fd5e2a3aa'

* commit '39087f8a69ab224f3b067bb79e5cd66fd5e2a3aa':
  Use the new VpnType.getDescriptionId().