Merge commit '25945ca2e67c0e46ff2ad46590cd71ca5b4b4266' into gingerbread-plus-aosp * commit '25945ca2e67c0e46ff2ad46590cd71ca5b4b4266': Fix silly touch bug in TextView. Oops.
Merge commit '25945ca2e67c0e46ff2ad46590cd71ca5b4b4266' into gingerbread-plus-aosp * commit '25945ca2e67c0e46ff2ad46590cd71ca5b4b4266': Fix silly touch bug in TextView. Oops.