tree 2bcf8272e5fe7cef85417fc8b89cec585b6c0498
parent 86a35ab4e757e266f613a2e431e16977514600a7
parent 1b570b571a63311f7f7d5b7cc5e17b3103fa8af9
author Satoshi Kataoka <satok@google.com> 1384410527 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384410527 -0800

am 1b570b57: am 5fd5aa3d: Fix compatibility issue on InputMethodSubtype

* commit '1b570b571a63311f7f7d5b7cc5e17b3103fa8af9':
  Fix compatibility issue on InputMethodSubtype