tree 980a920a4b52e2433fbfcea19db3545927f2918d
parent 62e7a42e68dc609cdd8f80fba8c59f64f2b128c2
parent 13a40719e8f66d75ea3277fdd4305772623cf84c
author Elliott Hughes <enh@google.com> 1267350056 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1267350056 -0800

am 4d5e5a0f: Merge "Keep the order from getaddrinfo() unchanged if preferIPv6Addresses() is true."

Merge commit '4d5e5a0f65e3cca6662fac8e832712fba61b9d2c' into dalvik-dev

* commit '4d5e5a0f65e3cca6662fac8e832712fba61b9d2c':
  Keep the order from getaddrinfo() unchanged if preferIPv6Addresses() is true.