tree a261cac5a69ebbc5cf717395918b6e0cdf6cd0be
parent d6c51aef6b8903ee2d9db3d1ed9f8736844e5201
parent af859fa9ae83e30dab8484bd4aaf5a37d588e020
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.