Merge commit '69717ccd13bb5568b912701ab39d603cfa7091cc' into gingerbread-plus-aosp * commit '69717ccd13bb5568b912701ab39d603cfa7091cc': DO NOT MERGE. Some stuff that is Not Ready.
Merge commit '69717ccd13bb5568b912701ab39d603cfa7091cc' into gingerbread-plus-aosp * commit '69717ccd13bb5568b912701ab39d603cfa7091cc': DO NOT MERGE. Some stuff that is Not Ready.