OSDN Git Service

am 544db7fa: (-s ours) am 56f47bf1: am ea90cd2f: Do not merge. Refresh "InputMethodPr...
authorSatoshi Kataoka <satok@google.com>
Fri, 18 Oct 2013 18:24:03 +0000 (11:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Oct 2013 18:24:03 +0000 (11:24 -0700)
commit8d4d9fa1722ef6a899703bff5c5d0270470c9f3c
tree22fca935639bbc064af2bcec7dc3ff20d3a1547e
parentaa71b635b8ebf717c771e4562ce7009f631c4c03
parent544db7fad02457d96ae0d69fb458cf7c10f03b1c
am 544db7fa: (-s ours) am 56f47bf1: am ea90cd2f: Do not merge. Refresh "InputMethodPreference"s onResume

* commit '544db7fad02457d96ae0d69fb458cf7c10f03b1c':
  Do not merge. Refresh "InputMethodPreference"s onResume