Commits
Jeff Brown authored and Android Git Automerger committed 8e5799ed16aM
am af685f3b: am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeycomb-mr2 * commit 'af685f3bb566f297deee1615d55d4f33d5580ba3': Refactor how timeouts are calculated. (DO NOT MERGE)
Showing diff to7d0fb570445