a47f02afb1
Merge change 2115 into donut * changes: bring the native_handle stuff back from master_gl Conflicts: libs/binder/Parcel.cpp |
||
---|---|---|
.. | ||
Android.mk | ||
Binder.cpp | ||
BpBinder.cpp | ||
IInterface.cpp | ||
IMemory.cpp | ||
IPCThreadState.cpp | ||
IPermissionController.cpp | ||
IServiceManager.cpp | ||
MemoryBase.cpp | ||
MemoryDealer.cpp | ||
MemoryHeapBase.cpp | ||
MemoryHeapPmem.cpp | ||
Parcel.cpp | ||
ProcessState.cpp | ||
Static.cpp |