5e782937ea
Merge commit 'faf775e772e329e821d81ba735474df097b1e1e9' into gingerbread-plus-aosp * commit 'faf775e772e329e821d81ba735474df097b1e1e9': Fix simulator build (1st attempt)