Kenny Root 461fa8b05d resolved conflicts for merge of 18490fb9 to master ...

Change-Id: I6c68e6fb0f9c1182a955689bbffc161a8f30bd37

2011-04-12 12:51:08 -07:00

..

ashmem.h

…

Asset.h

…

AssetDir.h

…

AssetManager.h

Runtime resource overlay, iteration 1.

2011-04-01 14:12:10 +02:00

Atomic.h

…

BackupHelpers.h

…

BitSet.h

Improve VelocityTracker numerical stability.

2011-03-15 19:59:47 -07:00

BufferedTextOutput.h

…

ByteOrder.h

…

CallStack.h

…

Compat.h

…

Debug.h

…

Endian.h

…

Errors.h

…

FileMap.h

…

Flattenable.h

…

Functor.h

Modify the GL renderer's functor to pass the clip to WebView

2011-03-16 15:31:33 -07:00

GenerationCache.h

Add TextLayout Cache

2011-03-02 13:29:20 -08:00

KeyedVector.h

…

List.h

…

Log.h

…

Looper.h

Fade out the mouse pointer after inactivity or other events.

2011-03-02 15:37:57 -08:00

misc.h

…

ObbFile.h

…

Pool.h

…

PropertyMap.h

…

RefBase.h

Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only

2011-03-07 16:56:16 -08:00

ResourceTypes.h

resolved conflicts for merge of 18490fb9 to master

2011-04-12 12:51:08 -07:00

SharedBuffer.h

…

Singleton.h

…

SortedVector.h

…

StopWatch.h

…

StreamingZipInflater.h

…

String8.h

Bug 4016329 do full string comparisons

2011-03-14 17:59:51 -07:00

String16.h

…

StringArray.h

…

StrongPointer.h

Fix sp<> conversion operator / constructor

2011-02-25 16:20:52 -08:00

SystemClock.h

…

TextOutput.h

…

threads.h

Bug 3362814 Fix SMP race in access to mRequestExit

2011-02-23 17:49:59 -08:00

Timers.h

Refactor how timeouts are calculated.

2011-03-17 17:29:09 -07:00

Tokenizer.h

…

TypeHelpers.h

Fix some issues with RefBase debugging.

2011-02-23 22:21:41 -08:00

Unicode.h

…

Vector.h

fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out

2011-03-17 00:04:42 -07:00

VectorImpl.h

…

ZipFileCRO.h

…

ZipFileRO.h

…

ZipUtils.h

…