| commit | 372d1715dac5de078ecda0921f3c374aa2f88bd0 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Thu Dec 15 10:07:25 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 15 10:07:25 2011 -0800 |
| tree | 68c3d72816d3ecda70f2242fa8f4d6c4072da8d2 | |
| parent | b98f6d3466f15a250e4f2851bbae16c66b014cf1 [diff] | |
| parent | b5052de75736527549d7e537632777c6fec2e4f0 [diff] |
am b5052de7: resolved conflicts for merge of a80bab37 to master * commit 'b5052de75736527549d7e537632777c6fec2e4f0': Fix issue #5756204: Crespo IME briefly appears shortened when...