tree 07102fe19396bce7bf334306a6afd1a3a2f30ca3
parent 22493272075482f4dc2d78eb8f502c9a091d78a8
parent 5d181a390b63970c08175afa64babb3dd46b11de
author Joe Malin <jmalin@google.com> 1332706135 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332706135 -0700

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

* commit '5d181a390b63970c08175afa64babb3dd46b11de':