Dianne Hackborn 66168d4bb4 resolved conflicts for merge of f51ded0f to master ... Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2		2011-06-10 12:45:36 -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	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	merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)	2011-06-06 15:14:25 -07:00
ResourceTypes.h	am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2	2011-06-09 16:06:07 -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