38a9f4050a
Merge commit 'e95d192fae5a80ed821c53bfea214a85ea395e90' into gingerbread-plus-aosp * commit 'e95d192fae5a80ed821c53bfea214a85ea395e90': Mainly fix two mistakes that I made: