Merge commit '3ecceb5b94233320ed88825759d6118fed7add2c' into gingerbread-plus-aosp * commit '3ecceb5b94233320ed88825759d6118fed7add2c': TextView refactoring to ease future merges in HC.
Merge commit '3ecceb5b94233320ed88825759d6118fed7add2c' into gingerbread-plus-aosp * commit '3ecceb5b94233320ed88825759d6118fed7add2c': TextView refactoring to ease future merges in HC.