am 811d2c75: am 7e56f226: Merge change I68a71c11 into eclair

Merge commit '811d2c7507b03f04391c7b21e0de795c6ad12f5d' into eclair-mr2-plus-aosp

* commit '811d2c7507b03f04391c7b21e0de795c6ad12f5d':
  Add Japanese font to SDK.