| commit | 270f43e008c2baff60174a3079399d887c55d6b0 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Wed May 25 14:35:21 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 25 14:35:21 2011 -0700 |
| tree | aa5096afcbfaf5c3d004f0a90d8880981302cc0e | |
| parent | 8cfb70cd82ce592af8df78957706a31e22a6a9a8 [diff] | |
| parent | 581a5c23345e2c90526f974638fecbaf3869671b [diff] |
am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeycomb-mr2 * commit '85a7f99cfe066f054d4ddf4feb737f0395c9943b': Refactor how timeouts are calculated. (DO NOT MERGE)