OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c06c4b 8fd062e)
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)
Merge commit '8fd062e1a5c0047deff1dd817a097b94891000f2' into eclair-plus-aosp

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


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help