OSDN Git Service

(root) / android-x86 / dalvik.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1507c7c 0c0cfd5)
am 0c0cfd5c: Merge change I96cd6f5b into eclair
authorLorenzo Colitti <lorenzo@google.com>
Thu, 1 Oct 2009 04:16:39 +0000 (21:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Oct 2009 04:16:39 +0000 (21:16 -0700)
Merge commit '0c0cfd5ce4a26187fb910ba701d0021989103a25' into eclair-plus-aosp

* commit '0c0cfd5ce4a26187fb910ba701d0021989103a25':
  Make the socket test accept ::1 as a valid result for


Trivial merge
dalvik
About OSDN
Find Software
Develop Software
Help