tree ba0b56aef21b297f502e9e4fb67a7121ca4cf0c3
parent 7a2fbbb3e6c807340be95807fbd70042466a5426
parent adbafa1a9b5adfa21884cc8fc7e73d61ab08d3c8
author Satoshi Kataoka <satok@google.com> 1366959117 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366959117 -0700

am adbafa1a: Merge "Support ICS on the user dictionary settings"

* commit 'adbafa1a9b5adfa21884cc8fc7e73d61ab08d3c8':
  Support ICS on the user dictionary settings