Mark Salyzyn db15537e6e resolve merge conflicts of 082a1721b5 to master ...

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I17f178f425975c1c0dbd48091d25b101956d505e

2017-01-11 08:30:17 -08:00

..

apk

Permit 65535 byte ZIP comments and empty Central Directory

2016-12-19 12:53:32 -08:00

jar

Fix crashing StrictJarFile due to doubled closing.

2016-12-06 10:05:05 +09:00

proto

ProtoOutputStream convenience methods.

2016-12-07 13:24:54 -08: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

…

BootTimingsTraceLog.java

Use push/peek/pop for operations on stack

2016-11-22 11:02:07 -08:00

Config.java

…

ContainerHelpers.java

…

DayOfMonthCursor.java

…

DebugUtils.java

…

DisplayMetrics.java

Update DisplayMetrics even on default display

2016-10-14 18:16:18 +00:00

EventLog.java

resolve merge conflicts of 082a1721b5 to master

2017-01-11 08:30:17 -08:00

EventLogTags.java

…

ExceptionUtils.java

…

FastImmutableArraySet.java

…

FloatMath.java

…

FloatProperty.java

…

Half.java

Introduce android.graphics.ColorSpace

2016-11-23 18:10:04 -08:00

IntArray.java

…

IntProperty.java

…

JsonReader.java

…

JsonScope.java

…

JsonToken.java

…

JsonWriter.java

…

KeyValueListParser.java

…

LayoutDirection.java

…

LocalLog.java

Better LocalLog

2016-10-11 09:54:19 +09:00

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

Fix vulnerability in MemoryIntArray

2016-12-09 00:08:33 +00:00

MonthDisplayHelper.java

…

NoSuchPropertyException.java

…

NtpTrustedTime.java

…

package.html

…

PackageUtils.java

Backup account access grants

2016-09-21 14:01:02 +00:00

Pair.java

…

PathParser.java

Convert utils fastjni -> @FastNative

2016-10-10 07:59:25 -07:00

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

…

Xml.java

…

XmlPullAttributes.java

…