tree 1d4f651d1fe2df027119c2faea6f38e79ef1ecc1
parent b95f4540180fe707c80dc987eaa965342623407b
parent 0b65f463c3cb9437d185a4a6439463f85620a9ce
author Ben Komalo <benkomalo@google.com> 1317063740 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317063740 -0700

am 0b65f463: Merge "Mark IME as a core app" into ics-factoryrom

* commit '0b65f463c3cb9437d185a4a6439463f85620a9ce':
  Mark IME as a core app