Brad Fitzpatrick 42a5ed2015 resolved conflicts for merge of 171c83f4 to master ...

Change-Id: I56a4c1838b17cf40d96763f95df3c84fc86359eb

2010-09-12 13:55:18 -07:00

..

format

…

method

…

style

…

util

…

AlteredCharSequence.java

…

AndroidBidi.java

…

AndroidCharacter.java

…

Annotation.java

…

AutoText.java

…

BoringLayout.java

…

ClipboardManager.java

…

DynamicLayout.java

…

Editable.java

…

GetChars.java

…

GraphicsOperations.java

…

Html.java

…

InputFilter.java

…

InputType.java

…

Layout.java

…

LoginFilter.java

…

MeasuredText.java

…

NoCopySpan.java

…

package.html

…

PackedIntVector.java

…

PackedObjectVector.java

…

ParcelableSpan.java

…

Selection.java

…

Spannable.java

…

SpannableString.java

…

SpannableStringBuilder.java

…

SpannableStringInternal.java

…

Spanned.java

…

SpannedString.java

…

SpanWatcher.java

…

StaticLayout.java

…

TextLine.java

…

TextPaint.java

…

TextUtils.java

resolved conflicts for merge of 171c83f4 to master

2010-09-12 13:55:18 -07:00

TextWatcher.java

…