tree 8b577408e344045624afea5a9311cef3646d41b6
parent 59e8eca2a42a35ff5b4d0874355656fa8db5d6ca
parent fbb38cd17727043aa04957aa5edd7c9fec4d076a
author Raph Levien <raph@google.com> 1343788167 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343788167 -0700

am fbb38cd1: Merge "Fix bug 6888377: crash in GetUnitsPerEm on locale change" into jb-mr1-dev

* commit 'fbb38cd17727043aa04957aa5edd7c9fec4d076a':
  Fix bug 6888377: crash in GetUnitsPerEm on locale change