OSDN Git Service

Fix for multiple merge problem.
authorGilles Debunne <debunne@google.com>
Sat, 5 Feb 2011 00:50:01 +0000 (16:50 -0800)
committerGilles Debunne <debunne@google.com>
Sat, 5 Feb 2011 00:50:01 +0000 (16:50 -0800)
commitcdfe899991c365d9e197d83f8859089cae082011
tree8696c09676282ae75f277f306d719e785e24d782
parentc0728cc042bd5cc6ab520d3395deec50481f8f5a
Fix for multiple merge problem.

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