Merge commit 'd2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3' into gingerbread-plus-aosp * commit 'd2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3': Fixed single line state on TextView.