Update ja.xml
Merge pull request #247 from tamo/patch-3

Update ja.xml
Merge branch 'beta' into beta-ics
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'master' into beta
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'beta-ics' into betayota
Merge branch 'yota2' into betayota
updated ChangeLog
Merge branch 'master' into ice-cream-sandwich
Merge branch 'beta' into beta-ics
Merge branch 'master' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'beta-ics' into betayota
Merge branch 'yota2' into betayota
typo
Merge branch 'master' into beta
Merge branch 'master' into ice-cream-sandwich