2fecae386d
Merge commit 'ad5499dd204a1512471778462a805a288595f2f2' into froyo-plus-aosp * commit 'ad5499dd204a1512471778462a805a288595f2f2': Hopefully get rid of some ANRs.