commit | 12362d0229edf92ecc40046072a16774792b22fb | [log] [tgz] |
---|---|---|
author | satok <satok@google.com> | Fri May 20 07:03:38 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 20 07:03:38 2011 -0700 |
tree | 1542c8901b2f9a9dcefde62c80518ca22f36f2fc | |
parent | 79ba9b5e39bfcbc6775bca56de139cf0fc5c914f [diff] | |
parent | 568b229d9f6d5d9111060fa61feecfc314301542 [diff] |
am 33bdc3c9: (-s ours) am d9435bce: am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework * commit '33bdc3c9995cbef477cec756b65d767558e6b836': Do not merge. Backport two fixes for InputMethethodFramework