Dianne Hackborn 79ba9b5e39 resolved conflicts for merge of 06a8ceac to master ... Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69		2011-05-19 21: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.	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	RefBase subclasses can now decide how they want to be destroyed.	2011-05-19 19:40:01 -07:00
ResourceTypes.h	am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.	2011-05-19 19:34:21 -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 typo in Vector<>:: push_back and push_front	2011-04-25 22:59:07 -07:00
VectorImpl.h
ZipFileCRO.h
ZipFileRO.h
ZipUtils.h