OSDN Git Service
(root)
/
android-x86
/
dalvik.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d9f8adb
1cf3dbc
)
am 1cf3dbce: Merge change 25160 into eclair
author
Lorenzo Colitti
<lorenzo@google.com>
Wed, 16 Sep 2009 01:24:49 +0000
(18:24 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 16 Sep 2009 01:24:49 +0000
(18:24 -0700)
Merge commit '
1cf3dbce0b94ae5427ef19422224627e20808364
' into eclair-plus-aosp
* commit '
1cf3dbce0b94ae5427ef19422224627e20808364
':
Make getHostByAddr and getHostByName return the proper object type.
Trivial merge