OSDN Git Service

resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp
authorGilles Debunne <debunne@google.com>
Wed, 9 Feb 2011 00:33:58 +0000 (16:33 -0800)
committerGilles Debunne <debunne@google.com>
Wed, 9 Feb 2011 00:33:58 +0000 (16:33 -0800)
commite04c14962f4a1089d411e1f7fa4d1019fe723885
tree2f240b612dc80d6e63e92661aaa52d6381c75c75
parenta62bf8bb6b7a547802fb384b497e955940befa9c
parentc0728cc042bd5cc6ab520d3395deec50481f8f5a
resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp

Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986
core/java/android/widget/TextView.java