Commits
Jeff Brown authored and Android Git Automerger committed 3d46889f89eM
am 8e5799ed: (-s ours) am af685f3b: am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeycomb-mr2 * commit '8e5799ed16ab605d8de775e1644f1fa59ff6627e': Refactor how timeouts are calculated. (DO NOT MERGE)
Showing diff to15291c6f55a