Raph Levien 1a91d8df50 resolved conflicts for merge of b9d21d62 to master ...

Change-Id: I2936c2a47290c3ea0fc66d460215f9e75d17ebf2

2014-12-08 13:46:15 -08:00

..

format

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

2014-11-25 15:34:56 +01:00

method

Fix some documentation typos.

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

style

…

util

…

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

Fix Layout.isRtlCharAt

2014-09-04 12:47:03 -07: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

resolved conflicts for merge of b9d21d62 to master

2014-12-08 13:46:15 -08:00

TextDirectionHeuristic.java

…

TextDirectionHeuristics.java

…

TextLine.java

…

TextPaint.java

…

TextUtils.java

am 4fec1b48: am 600ca140: Merge "Use constants instead of resources for ellipsis."

2014-09-19 23:16:52 +00:00

TextWatcher.java

…