tree b844d1e140e0287633627abc799eba6340bda2c9
parent 278296b59fb16b5dcb7cc8e5a7538518a2a3dbb7
parent 093ed3838c3f2847be1893ea49c6b15b90e0afc3
author Joe Malin <jmalin@google.com> 1332705899 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332705899 -0700

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

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