c4f52bd755
Merge commit '7e5c5d975297ef76ae6640e06505a19fa8c0270e' into eclair-mr2-plus-aosp * commit '7e5c5d975297ef76ae6640e06505a19fa8c0270e': Fix issue #2163654: deadlock, runtime restart