OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
28c6e2e
39087f8
)
am 39087f8a: am 8fd062e1: Use the new VpnType.getDescriptionId().
author
Hung-ying Tyan
<tyanh@google.com>
Thu, 1 Oct 2009 18:55:05 +0000
(11:55 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 1 Oct 2009 18:55:05 +0000
(11:55 -0700)
Merge commit '
39087f8a69ab224f3b067bb79e5cd66fd5e2a3aa
'
* commit '
39087f8a69ab224f3b067bb79e5cd66fd5e2a3aa
':
Use the new VpnType.getDescriptionId().
Trivial merge