Tao Bao 6d8886ac46 resolved conflicts for merge of e1e1cd9d to lmp-mr1-dev-plus-aosp ...

Change-Id: If01cb9c91c4f980d422896aa5ebe713f540d4fd1

2015-02-11 22:32:05 -08:00

..

format

resolved conflicts for merge of e1e1cd9d to lmp-mr1-dev-plus-aosp

2015-02-11 22:32:05 -08:00

method

…

style

…

util

Revert "Change Linkify leniency to VALID"

2014-12-17 14:31:39 -08:00

AlteredCharSequence.java

…

AndroidBidi.java

…

AndroidCharacter.java

…

Annotation.java

…

AutoText.java

…

BidiFormatter.java

…

BoringLayout.java

resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp

2014-10-02 14:32:37 +01:00

ClipboardManager.java

…

DynamicLayout.java

…

Editable.java

…

GetChars.java

…

GraphicsOperations.java

…

Html.java

…

InputFilter.java

…

InputType.java

…

Layout.java

Avoid static initialization of Layout from TextUtils

2015-02-06 17:34:37 +00:00

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

…

SpanSet.java

…

SpanWatcher.java

…

StaticLayout.java

Avoid static initialization of Layout from TextUtils

2015-02-06 17:34:37 +00:00

TextDirectionHeuristic.java

…

TextDirectionHeuristics.java

…

TextLine.java

Fixing a memory leak: activities are leaked.

2015-01-16 18:14:36 +00:00

TextPaint.java

…

TextUtils.java

Avoid static initialization of Layout from TextUtils

2015-02-06 17:34:37 +00:00

TextWatcher.java

…