Merge commit '592988d307e8d305ca163c4e58da0fb350054194' into eclair-mr2-plus-aosp * commit '592988d307e8d305ca163c4e58da0fb350054194': Add unit tests for Japanization and fix several bugs.
Merge commit '592988d307e8d305ca163c4e58da0fb350054194' into eclair-mr2-plus-aosp * commit '592988d307e8d305ca163c4e58da0fb350054194': Add unit tests for Japanization and fix several bugs.