Merge commit '1a140bf65c288fcb1458bbd694c9d6e7a567a0f5' into gingerbread-plus-aosp * commit '1a140bf65c288fcb1458bbd694c9d6e7a567a0f5': Remove some obsolete code.
Merge commit '1a140bf65c288fcb1458bbd694c9d6e7a567a0f5' into gingerbread-plus-aosp * commit '1a140bf65c288fcb1458bbd694c9d6e7a567a0f5': Remove some obsolete code.