83af4fbb0e
Merge commit '4c571a62b1a4fb71585179bce84246b55097b47e' into gingerbread-plus-aosp * commit '4c571a62b1a4fb71585179bce84246b55097b47e': Fix the build.