| commit | eecb5b9873bf2c2e61929a35c2762f03dd2bfeb0 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Thu Sep 23 14:20:48 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 23 14:20:48 2010 -0700 |
| tree | b35beb1798596e811b443eabc7410ee5ed179448 | |
| parent | 6f27ab8bd4aca5a43f6bf93cd68c43dde825bfa1 [diff] | |
| parent | 2983e038d189a257f1e5abb9c120bd1feb253773 [diff] |
am 2983e038: am 045398e6: Merge "Fix a deadlock I ran into." into gingerbread Merge commit '2983e038d189a257f1e5abb9c120bd1feb253773' * commit '2983e038d189a257f1e5abb9c120bd1feb253773': Fix a deadlock I ran into.