am b32d0f23: am e2978c8d: Merge "Fix for an NPE in TextView." into gingerbread

Merge commit 'b32d0f23a82452d6f7fa8c513e179f1287621905'

* commit 'b32d0f23a82452d6f7fa8c513e179f1287621905':
  Fix for an NPE in TextView.