tree 0a2e1fbb30e126b0f861246a422991afbcd4c310
parent b3bab92e6b4541e0718aade2396e667b06d98358
parent 9ca39d744cdf6ffdb782bbc883b2f4266545f64e
author Yohei Yukawa <yukawa@google.com> 1413227203 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413227203 +0000

am 9ca39d74: am 540861c9: am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev

* commit '9ca39d744cdf6ffdb782bbc883b2f4266545f64e':
  Update config when "Show input method" is changed