b5c6be6db2
Merge commit '082e51712ab9c9ce94eaee88797bbdbc80b2004d' into eclair-mr2-plus-aosp * commit '082e51712ab9c9ce94eaee88797bbdbc80b2004d': Squashed commit of the following: