3d14b1a170
Merge commit '1e914ac7fce9523b5a932389798589eba91ca4dd' into eclair-mr2-plus-aosp * commit '1e914ac7fce9523b5a932389798589eba91ca4dd': Fix simulator build.