Tao Bao 0d27729dd8 resolve merge conflicts of 6d8886a to master. ...

Change-Id: If8798a1d87b35e2db56211bf0e7dea94bed91b6a

2015-02-12 11:26:00 -08:00

..

format

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

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

method

Fix some documentation typos.

2014-09-30 02:52:26 +00:00

style

…

util

Add @Nullable annotation where necessary in Rfc822Token

2015-01-15 10:50:31 -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

resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp

2014-09-08 13:08:43 -07:00

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

Up/down arrow moves to beginning/end of buffer

2014-09-04 15:03:14 -07:00

Spannable.java

…

SpannableString.java

…

SpannableStringBuilder.java

…

SpannableStringInternal.java

…

Spanned.java

…

SpannedString.java

…

SpanSet.java

…

SpanWatcher.java

…

StaticLayout.java

am 022cf57f: am a08934cf: am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev

2015-02-06 17:52:57 +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

…