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

…

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

…

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

…

KeyedVector.h

…

List.h

…

Log.h

…

Looper.h

…

misc.h

…

ObbFile.h

…

Pool.h

…

PropertyMap.h

…

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

…

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

…

SystemClock.h

…

TextOutput.h

…

threads.h

…

Timers.h

Refactor how timeouts are calculated. (DO NOT MERGE)

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

Tokenizer.h

…

TypeHelpers.h

…

Unicode.h

…

Vector.h

fix typo in Vector<>:: push_back and push_front

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

VectorImpl.h

…

ZipFileCRO.h

…

ZipFileRO.h

…

ZipUtils.h

…