Merge commit '045398e6243fa4e83fb6435df4e8ffc6a7487a70' into gingerbread-plus-aosp * commit '045398e6243fa4e83fb6435df4e8ffc6a7487a70': Fix a deadlock I ran into.
Merge commit '045398e6243fa4e83fb6435df4e8ffc6a7487a70' into gingerbread-plus-aosp * commit '045398e6243fa4e83fb6435df4e8ffc6a7487a70': Fix a deadlock I ran into.