tree ee0d5d7e0b540c42d30f1ab075b8e0648954f427
parent 63fcdd7e833df417cfbd60961a5167ce637f3071
parent 901c9c6f79e63e3babd3c1184455f3b44abd197d
author Jesse Wilson <jessewilson@google.com> 1285817727 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285817727 -0700

am 901c9c6f: am 8047b6f0: Merge "Support creating unbound server sockets in DefaultServerSocketFactory." into gingerbread

Merge commit '901c9c6f79e63e3babd3c1184455f3b44abd197d'

* commit '901c9c6f79e63e3babd3c1184455f3b44abd197d':
  Support creating unbound server sockets in DefaultServerSocketFactory.