Dianne Hackborn 8a7d44e824 resolved conflicts for merge of 54cb63e2 to master ...

Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10

2011-06-02 16:44:52 -07:00

..

AndroidException.java

Fragment and PreferenceFragment and FragmentManager, oh my!

2010-08-12 17:23:48 -07:00

AndroidRuntimeException.java

Fragment and PreferenceFragment and FragmentManager, oh my!

2010-08-12 17:23:48 -07:00

AttributeSet.java

Add missing docs to AttributeSet.

2011-02-22 11:32:29 -08:00

Base64.java

…

Base64DataException.java

Throw Base64DataException instead of IOException

2011-01-24 16:47:56 -08:00

Base64InputStream.java

Throw Base64DataException instead of IOException

2011-01-24 16:47:56 -08:00

Base64OutputStream.java

Throw Base64DataException instead of IOException

2011-01-24 16:47:56 -08:00

CalendarUtils.java

b/3279789 Fixed NPE in CalendarUtils$TimeZoneUtils$AsyncTZHandler.onQueryComplete

2011-01-09 12:11:02 -08:00

CharsetUtils.java

…

DayOfMonthCursor.java

…

DebugUtils.java

Remove default constructors from static utility classes.

2011-02-24 10:46:22 -08:00

DisplayMetrics.java

Add "tv" density for 720p screens.

2011-05-27 13:40:26 -07:00

EventLog.java

Remove default constructors from static utility classes.

2011-02-24 10:46:22 -08:00

EventLogTags.java

Add @Deprecated to match @deprecated where it's missing.

2010-11-09 10:10:11 -08:00

FastImmutableArraySet.java

Optimize IntentResolver to reduce lookup time by 50%.

2011-01-28 17:34:01 -08:00

FinitePool.java

…

FloatMath.java

…

JsonReader.java

Pool strings in JsonReader.

2011-04-21 13:48:35 -07:00

JsonScope.java

A new streaming JSON API.

2010-08-06 10:34:44 -07:00

JsonToken.java

A new streaming JSON API.

2010-08-06 10:34:44 -07:00

JsonWriter.java

Patch new JSON APIs with changes informed by GSON.

2011-01-10 12:56:31 -08:00

Log.java

Reduce log spew.

2011-05-19 13:32:25 -07:00

LogPrinter.java

…

LogWriter.java

Maybe fix issue #3093599: java.lang.IndexOutOfBoundsException...

2011-01-24 21:23:03 -08:00

LongSparseArray.java

…

LruCache.java

Fix a bogus comment on LruCache.hitCount()

2011-03-16 14:57:01 -07:00

MalformedJsonException.java

Patch new JSON APIs with changes informed by GSON.

2011-01-10 12:56:31 -08:00

MathUtils.java

…

MonthDisplayHelper.java

…

NtpTrustedTime.java

Avoid throwing when forceRefresh() missing server.

2011-05-04 11:58:06 -07:00

package.html

…

Pair.java

…

Patterns.java

…

Pool.java

…

Poolable.java

…

PoolableManager.java

…

Pools.java

…

PrefixPrinter.java

Misc Looper cleanups; add android.util.PrefixPrinter

2010-11-23 17:17:33 -08:00

Printer.java

…

PrintStreamPrinter.java

…

PrintWriterPrinter.java

…

Singleton.java

Cache WindowManager in StrictMode; add android.util.Singleton

2010-11-22 23:00:23 -08:00

Slog.java

…

SparseArray.java

…

SparseBooleanArray.java

…

SparseIntArray.java

…

StateSet.java

Remove default constructors from static utility classes.

2011-02-24 10:46:22 -08:00

StringBuilderPrinter.java

…

SynchronizedPool.java

…

TimeFormatException.java

…

TimeUtils.java

Tracking merge of dalvik-dev to master

2011-04-01 16:00:23 -07:00

TimingLogger.java

Add facilities for layout transitions

2010-08-24 13:09:20 -07:00

TrustedTime.java

Tests for ThrottleService, NTP into TrustedTime.

2011-04-28 12:28:36 -07:00

TypedValue.java

…

Xml.java

Tracking merge of dalvik-dev to master

2011-04-01 16:00:23 -07:00

XmlPullAttributes.java

…