commit | 1802935852694ee8797464f62c4c87b5886939e8 | [log] [tgz] |
---|---|---|
author | Brian Carlstrom <bdc@google.com> | Tue Sep 25 16:50:47 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 25 16:50:47 2012 -0700 |
tree | e10f11de9741dea6fe350bd6726d348b4b7c5617 | |
parent | 6c20a0ae0a26806f4d8be626510962c4a9a43672 [diff] | |
parent | bee07548d5beda94538a211383847889dc9224b5 [diff] |
am bee07548: am fe54290d: Merge "Add a static generator that takes a Socket Write Timeout Argumanet" into jb-mr1-dev * commit 'bee07548d5beda94538a211383847889dc9224b5': Add a static generator that takes a Socket Write Timeout Argumanet