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

Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10

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

..

ashmem.h

…

Asset.h

Change assets to use 64-bit API

2010-12-08 11:21:30 -08:00

AssetDir.h

…

AssetManager.h

Runtime resource overlay, iteration 1.

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

Atomic.h

…

BackupHelpers.h

Full local backup infrastructure

2011-05-10 17:52:51 -07:00

BitSet.h

Improve VelocityTracker numerical stability. (DO NOT MERGE)

2011-05-23 17:19:59 -07:00

BufferedTextOutput.h

…

ByteOrder.h

…

CallStack.h

dump callstack on Surface use error

2010-12-10 15:37:48 -08:00

Compat.h

Change assets to use 64-bit API

2010-12-08 11:21:30 -08:00

Debug.h

…

Endian.h

…

Errors.h

…

FileMap.h

Change assets to use 64-bit API

2010-12-08 11:21:30 -08:00

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

OBB: use PBKDF2 for key generation.

2010-10-13 18:25:33 -07:00

Pool.h

…

PropertyMap.h

Add initial support for cursor-based pointing devices.

2010-12-29 13:19:53 -08:00

RefBase.h

RefBase subclasses can now decide how they want to be destroyed.

2011-05-19 19:40:01 -07:00

ResourceTypes.h

am 528c49f1: am b96cbbd1: Add "tv" density for 720p screens.

2011-05-27 14:27:46 -07:00

SharedBuffer.h

…

Singleton.h

Purge Skia objects from GL caches as needed.

2010-09-08 18:04:33 -07:00

SortedVector.h

…

StopWatch.h

…

StreamingZipInflater.h

Change assets to use 64-bit API

2010-12-08 11:21:30 -08:00

String8.h

Bug 4016329 do full string comparisons

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

String16.h

Split UTF functions from String8/16

2010-11-12 15:53:40 -08:00

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. (DO NOT MERGE)

2011-05-23 17:20:42 -07:00

Tokenizer.h

Improve support for external keyboards.

2010-12-02 16:01:32 -08:00

TypeHelpers.h

Fix some issues with RefBase debugging.

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

Unicode.h

Split UTF functions from String8/16

2010-11-12 15:53:40 -08:00

Vector.h

fix typo in Vector<>:: push_back and push_front

2011-04-25 22:59:07 -07:00

VectorImpl.h

…

ZipFileCRO.h

Change assets to use 64-bit API

2010-12-08 11:21:30 -08:00

ZipFileRO.h

Change assets to use 64-bit API

2010-12-08 11:21:30 -08:00

ZipUtils.h

…