commit | af685f3bb566f297deee1615d55d4f33d5580ba3 | [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 | f94e264d7358f8734d23b761d3df67a5743de842 | |
parent | 16330e249663fed890df0e95fce4016c2971120a [diff] | |
parent | 85a7f99cfe066f054d4ddf4feb737f0395c9943b [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)