tree b92aea7cc73c8e898d9dbec71a85547ec4d24687
parent e5e02aac299bd0f864677ab62ebd804d79f69d44
parent c0a5e8df03d949cb307a0eb98f0222086c0434c1
author Jeff Brown <jeffbrown@google.com> 1300418202 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1300418202 -0700

Merge "Refactor how timeouts are calculated."