Svetoslav Ganov f3b4f3163b resolved conflicts for merge of 26f7a81f to master ...

Change-Id: I6bf5fd7c0de7945cef84602dbe3a7bbed587700f

2011-11-30 18:34:56 -08:00

..

AndroidException.java

…

AndroidRuntimeException.java

…

AttributeSet.java

…

Base64.java

…

Base64DataException.java

…

Base64InputStream.java

…

Base64OutputStream.java

…

CharsetUtils.java

…

Config.java

…

DayOfMonthCursor.java

…

DebugUtils.java

…

DisplayMetrics.java

…

EventLog.java

…

EventLogTags.java

…

FastImmutableArraySet.java

…

FinitePool.java

…

FloatMath.java

…

FloatProperty.java

…

IntProperty.java

…

JsonReader.java

Fix benign off-by-one in JsonReader.

2011-07-22 09:01:48 -07:00

JsonScope.java

…

JsonToken.java

…

JsonWriter.java

…

LocaleUtil.java

Fix bug #5199577 TextView with android:password="true" is showing the "dots" on the left even if the password chars are RTL

2011-08-25 18:43:37 -07:00

Log.java

…

LogPrinter.java

…

LogWriter.java

…

LongSparseArray.java

…

LruCache.java

Add a link from LruCache to the Android support package (compatibility library).

2011-11-17 13:40:01 -05:00

MalformedJsonException.java

…

MathUtils.java

…

MonthDisplayHelper.java

…

NoSuchPropertyException.java

…

NtpTrustedTime.java

…

package.html

…

Pair.java

…

Patterns.java

…

Pool.java

…

Poolable.java

…

PoolableManager.java

…

Pools.java

…

PrefixPrinter.java

…

Printer.java

…

PrintStreamPrinter.java

…

PrintWriterPrinter.java

…

Property.java

…

ReflectiveProperty.java

…

Singleton.java

…

Slog.java

…

SparseArray.java

Fixing memory leaks in the accessiiblity layer.

2011-11-29 18:51:30 -08:00

SparseBooleanArray.java

…

SparseIntArray.java

…

SparseLongArray.java

Adding APIs to enable reporting virtual view hierarchies to accessibility serivces.

2011-10-21 11:45:44 -07:00

StateSet.java

…

StringBuilderPrinter.java

…

SynchronizedPool.java

…

TimeFormatException.java

…

TimeUtils.java

…

TimingLogger.java

…

TrustedTime.java

…

TypedValue.java

…

Xml.java

…

XmlPullAttributes.java

Make some methods/fields package private so that layoutlib can access them.

2011-08-11 12:57:51 -07:00