tree ed1d75b742341fa66301fa6473441e4a3f899c92
parent 2d7d3f78c90734c8067ab76b8f5daca84a311c92
parent 7ae7d31c2fb06a5c53e71c9e77fa75c8f5777391
author Jean-Baptiste Queru <jbq@google.com> 1305737176 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305737176 -0700

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

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