Neil Fuller c2a0b4482d resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp ...

Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7

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

..

AndroidException.java

…

AndroidRuntimeException.java

…

ArrayMap.java

Add indexOf method to ArrayMap & ArraySet

2014-08-26 11:53:32 -07:00

ArraySet.java

Add indexOf method to ArrayMap & ArraySet

2014-08-26 11:53:32 -07:00

AtomicFile.java

First iteration of a public UsageStats API

2014-07-18 15:24:20 -07:00

AttributeSet.java

Doc update: misc fixes

2013-03-28 16:33:46 -07:00

Base64.java

…

Base64DataException.java

…

Base64InputStream.java

…

Base64OutputStream.java

…

Config.java

…

ContainerHelpers.java

Uses VMRuntime.newUnpaddedArray for ideal array sizes

2014-03-27 11:42:10 -07:00

DayOfMonthCursor.java

…

DebugUtils.java

If frameworks wants ASCII casing, it should explicity ask for it.

2013-08-02 15:12:32 -07:00

DisplayMetrics.java

Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.

2014-09-26 00:54:32 +00:00

EventLog.java

EventLog: event log translation errors

2014-04-25 13:45:03 -07:00

EventLogTags.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

ExceptionUtils.java

Mark resource-only splits as hasCode=false.

2014-07-15 20:18:39 -07:00

FastImmutableArraySet.java

…

FloatMath.java

…

FloatProperty.java

…

IntProperty.java

…

JsonReader.java

Fixed a possible infinite loop in JsonReader#skipValue()

2014-02-18 19:19:15 +00:00

JsonScope.java

…

JsonToken.java

…

JsonWriter.java

…

LayoutDirection.java

Fix bug #10549094 KLP API Review: android.util.LayoutDirection

2013-08-29 18:13:28 -07:00

LocalLog.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

Log.java

Fix issue #17146552: system anr

2014-08-26 22:55:47 -07:00

LogPrinter.java

…

LogWriter.java

…

LongArray.java

Uses VMRuntime.newUnpaddedArray for ideal array sizes

2014-03-27 11:42:10 -07:00

LongSparseArray.java

Uses VMRuntime.newUnpaddedArray for ideal array sizes

2014-03-27 11:42:10 -07:00

LongSparseLongArray.java

Uses VMRuntime.newUnpaddedArray for ideal array sizes

2014-03-27 11:42:10 -07:00

LruCache.java

Make LruCache.resize(int) public

2014-02-20 10:27:55 +00:00

MalformedJsonException.java

…

MapCollections.java

Fix off-by-one issue when removing from Iterator

2013-11-01 12:00:53 -07:00

MathUtils.java

Switch from FloatMath -> Math and Math.hypot where possible

2014-10-01 14:04:15 +01:00

MonthDisplayHelper.java

…

NoSuchPropertyException.java

…

NtpTrustedTime.java

…

package.html

…

Pair.java

…

PathParser.java

API REVIEW: VectorDrawable

2014-07-25 23:26:41 +00:00

Patterns.java

Tune down the linkify false positive rate

2014-04-23 11:17:20 -07:00

Pools.java

…

PrefixPrinter.java

…

Printer.java

…

PrintStreamPrinter.java

…

PrintWriterPrinter.java

…

Property.java

…

Range.java

add utility methods to util.Range, Rational and Size

2014-07-12 14:12:27 -07:00

Rational.java

add utility methods to util.Range, Rational and Size

2014-07-12 14:12:27 -07:00

ReflectiveProperty.java

…

Singleton.java

…

Size.java

Move Size parceling to Bundle.

2014-09-05 09:07:35 -07:00

SizeF.java

add android.util.SizeF.parseSizeF()

2014-09-09 21:16:03 -07:00

Slog.java

Fix issue #17146552: system anr

2014-08-26 22:55:47 -07:00

SparseArray.java

Uses VMRuntime.newUnpaddedArray for ideal array sizes

2014-03-27 11:42:10 -07:00

SparseBooleanArray.java

Uses VMRuntime.newUnpaddedArray for ideal array sizes

2014-03-27 11:42:10 -07:00

SparseIntArray.java

Uses VMRuntime.newUnpaddedArray for ideal array sizes

2014-03-27 11:42:10 -07:00

SparseLongArray.java

Uses VMRuntime.newUnpaddedArray for ideal array sizes

2014-03-27 11:42:10 -07:00

Spline.java

Switch from FloatMath -> Math and Math.hypot where possible

2014-10-01 14:04:15 +01:00

StateSet.java

…

StringBuilderPrinter.java

…

SuperNotCalledException.java

Add View#cancelPendingInputEvents API

2013-09-05 00:55:20 +00:00

TimedRemoteCaller.java

Print - platform APIs

2013-06-21 18:43:17 -07:00

TimeFormatException.java

Rewriting android.text.format.Time without the native _tz functions

2014-07-24 11:37:20 +01:00

TimeUtils.java

am 5a44bdc8: am 8382b0d3: am ab9a19e3: Merge "Remove some pointless code."

2014-06-16 10:03:19 +00:00

TimingLogger.java

…

TrustedTime.java

…

TypedValue.java

Hide an old debug function.

2014-01-24 13:10:19 -08:00

Xml.java

…

XmlPullAttributes.java

…