tree 82cec74b5eb2d26dff215358784d3c4af8bbe428
parent bc851023f2985bd93647d258b0c214040816b732
parent fba7f5d73cce893860faa3af9df7b4099a8565a1
author Makoto Onuki <omakoto@google.com> 1433539902 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433539902 +0000

am fba7f5d7: Merge "Fix crash on simplified Chinese." into mnc-dev

* commit 'fba7f5d73cce893860faa3af9df7b4099a8565a1':
  Fix crash on simplified Chinese.