tree d993c0710cef0093613b72fc236afec6c7907f4f
parent 106d846080d6d239ab0eb3539cd92516046dcd4d
parent 093ed3838c3f2847be1893ea49c6b15b90e0afc3
author Joe Malin <jmalin@google.com> 1332705898 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332705898 -0700

am 093ed383: Merge "DOC CHANGE: IME subtype article" into ics-mr1

* commit '093ed3838c3f2847be1893ea49c6b15b90e0afc3':
  DOC CHANGE: IME subtype article