tree abf0cb882b85ab703737f9fb7d4f726c8a3b3898
parent c1fad4a2e39ca5d5f2dbb45a67686f3423b8fe2d
parent 275708c82cad1119d645b4be533b1ad0088e148c
author Nick Pelly <npelly@google.com> 1288734406 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1288734406 -0700

Merge "Remove timeout support." into gingerbread