tree 3554742d44af2f055229052619558b5da9e22d04
parent 0e784cb3b0e8fe802fb13db7a9a5cb5df11ac804
parent fe54290df0c5d495b7f388035a4ae3a20821a183
author Brian Carlstrom <bdc@google.com> 1348616898 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348616898 -0700

am fe54290d: Merge "Add a static generator that takes a Socket Write Timeout Argumanet" into jb-mr1-dev

* commit 'fe54290df0c5d495b7f388035a4ae3a20821a183':
  Add a static generator that takes a Socket Write Timeout Argumanet