tree 5172a4a593bed688c3f480e080e1e42c8a3546d3
parent a97c5f7779bbd53896b5312c9dd04c505511781d
parent abdbb5c1e5144e11d72367f79816caaa1dc63f8d
author satok <satok@google.com> 1285317710 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285317710 -0700

am abdbb5c1: am 933fc94c: Merge "Use MOTOYA font for Japanese font" into gingerbread

Merge commit 'abdbb5c1e5144e11d72367f79816caaa1dc63f8d'

* commit 'abdbb5c1e5144e11d72367f79816caaa1dc63f8d':
  Use MOTOYA font for Japanese font