tree b1551de9f7c570d15e716c2c64aeebbb8f5304f9
parent 69cb87576ba163b61bb0e6477a3b7c57a9b11d40
author satok <satok@google.com> 1305883193 +0900
committer satok <satok@google.com> 1305897114 +0900

Do not merge. Backport two fixes for InputMethethodFramework

Bug: 3420384

backport cl1: Iaf293cf6c6fb35a994f344b0afc30e9f523032f4
backport cl2: I29d2555aeb7d0e51205d9f1fe0da708df0890942

Change-Id: Ia71ba27957fa818dc4ef8ff05b5fdb120b9650e0