tree 9beb45972090095bc15f649a619b23ab3937e854
parent 24ea88a986cfb6de7197b213ad933a6eb6f0e285
parent 9aa7c6e583ac18d6c338af8d478512c4ab5293b4
author Michael Wright <michaelwr@google.com> 1394067832 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394067832 +0000

am 9aa7c6e5: am e4a71792: am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev

* commit '9aa7c6e583ac18d6c338af8d478512c4ab5293b4':
  Revert Japanese special case fallback keys.