| commit | 9a2c1ca2dd96c30a7bd2242cf08e9f4ba80cc31c | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Wed May 25 14:42:20 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 25 14:42:20 2011 -0700 |
| tree | 2fe66db634a483e4cbf2c768ba3b8f30be571c48 | |
| parent | 689e53cc822f0dc543d3728559a6ed8cea60cf57 [diff] | |
| parent | 270f43e008c2baff60174a3079399d887c55d6b0 [diff] |
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)