tree 384bd709bfdad1b99e928efef531b47d16a3d8f3
parent f066f6cffe1f6757174f5c26e49ef6fc5524e3d5
parent 4664d07374ce87922eeb61edd26e2487d6c4e869
author Jean-Baptiste Queru <jbq@google.com> 1305737538 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305737538 -0700

am a38762f3: am 7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font files."

* commit 'a38762f340853cca5a07732c21e9fb816fd252b8':
  MOTOYA changed two kinds of Japanese font files.