OSDN Git Service

am cdfe8999: Fix for multiple merge problem.
authorGilles Debunne <debunne@google.com>
Wed, 9 Feb 2011 01:31:33 +0000 (17:31 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Feb 2011 01:31:33 +0000 (17:31 -0800)
commit63bd55c7bf6f5d9384ad25637a4f4a7d2ef8d441
treeda3cf37228b3195e431a4ce1d56489e652fa99ce
parente04c14962f4a1089d411e1f7fa4d1019fe723885
parentcdfe899991c365d9e197d83f8859089cae082011
am cdfe8999: Fix for multiple merge problem.

* commit 'cdfe899991c365d9e197d83f8859089cae082011':
  Fix for multiple merge problem.
core/java/android/widget/TextView.java