Svetoslav Ganov 388d08b6e3 resolve merge conflicts of a2c1196 to master ...

Change-Id: I221f03e2cda9e677199698d492d16788c25c9e96

2016-08-31 18:02:57 -07:00

..

apk

…

jar

Merge "Add a finalize() method to StrictJarFile"

2016-08-09 10:49:58 +00:00

AndroidException.java

…

AndroidRuntimeException.java

…

ArrayMap.java

…

ArraySet.java

resolve merge conflicts of 5827257 to master

2016-08-29 12:50:47 -07:00

AtomicFile.java

…

AttributeSet.java

…

BackupUtils.java

…

Base64.java

…

Base64DataException.java

…

Base64InputStream.java

…

Base64OutputStream.java

…

Config.java

…

ContainerHelpers.java

…

DayOfMonthCursor.java

…

DebugUtils.java

…

DisplayMetrics.java

Add DENSITY_260, DENSITY_300, DENSITY_340

2016-06-15 10:33:09 -07:00

EventLog.java

…

EventLogTags.java

…

ExceptionUtils.java

…

FastImmutableArraySet.java

…

FloatMath.java

…

FloatProperty.java

…

IntArray.java

…

IntProperty.java

…

JsonReader.java

…

JsonScope.java

…

JsonToken.java

…

JsonWriter.java

…

KeyValueListParser.java

Work on issue #28942589: Tune job scheduler

2016-05-31 18:16:19 -07:00

LayoutDirection.java

…

LocalLog.java

…

Log.java

…

LogPrinter.java

…

LogWriter.java

…

LongArray.java

…

LongSparseArray.java

indexOfValue now uses .equals (cont.)

2016-07-18 12:03:14 -07:00

LongSparseLongArray.java

…

LruCache.java

…

MalformedJsonException.java

…

MapCollections.java

…

MathUtils.java

…

MemoryIntArray.aidl

…

MemoryIntArray.java

resolve merge conflicts of a2c1196 to master

2016-08-31 18:02:57 -07:00

MonthDisplayHelper.java

…

NoSuchPropertyException.java

…

NtpTrustedTime.java

…

package.html

…

Pair.java

…

PathParser.java

…

Patterns.java

…

Pools.java

…

PrefixPrinter.java

…

Printer.java

…

PrintStreamPrinter.java

…

PrintWriterPrinter.java

…

Property.java

…

Range.java

…

Rational.java

…

ReflectiveProperty.java

…

Singleton.java

…

Size.java

…

SizeF.java

…

Slog.java

…

SparseArray.java

indexOfValueByValue now uses .equals

2016-07-15 10:51:18 -07:00

SparseBooleanArray.java

…

SparseIntArray.java

…

SparseLongArray.java

…

Spline.java

…

StateSet.java

…

StringBuilderPrinter.java

…

SuperNotCalledException.java

…

TimedRemoteCaller.java

Allow calls to TimedRemoteCaller in parallel.

2016-08-12 14:19:18 -07:00

TimeFormatException.java

…

TimeUtils.java

…

TimingLogger.java

…

TrustedTime.java

…

TypedValue.java

Fixed rounding logic in TypedValue to handle negative values correctly

2016-06-07 16:08:35 -07:00

Xml.java

…

XmlPullAttributes.java

…