f309c7a869
Merge commit '1b400c7763e63505bafd496953764c3e97c2be5b' into gingerbread-plus-aosp * commit '1b400c7763e63505bafd496953764c3e97c2be5b': Fix for NPE in TextView.