Mathias Agopian 723ec00af4 Merge commit 'goog/master' into merge_master ... Conflicts: include/ui/Rect.h libs/ui/ISurfaceComposer.cpp		2009-05-27 14:34:50 -07:00
..
Binder.h
BpBinder.h
IBinder.h
IInterface.h
IMemory.h
IPCThreadState.h
IPermissionController.h
IServiceManager.h
MemoryBase.h
MemoryDealer.h	Merge commit 'goog/master' into merge_master	2009-05-27 14:34:50 -07:00
MemoryHeapBase.h
MemoryHeapPmem.h
Parcel.h
ProcessState.h