diff options
author | 2009-05-22 01:27:01 -0700 | |
---|---|---|
committer | 2009-05-22 02:16:08 -0700 | |
commit | 310f8da0c3122ed5419db8f12a6e98d3188325b2 (patch) | |
tree | 0f3435d35e7fe8fca8dc2b347ff46276a8c351c8 /libs/ui/ISurfaceComposer.cpp | |
parent | 20f68782a4ea71c6a977d7f87d8288d3daa265ec (diff) | |
parent | bdbf6b094d61f694f162a5a5279caededcb1f0a5 (diff) |
merge master to master_gl
Diffstat (limited to 'libs/ui/ISurfaceComposer.cpp')
-rw-r--r-- | libs/ui/ISurfaceComposer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ui/ISurfaceComposer.cpp b/libs/ui/ISurfaceComposer.cpp index 1932bf90b2..869e4281a2 100644 --- a/libs/ui/ISurfaceComposer.cpp +++ b/libs/ui/ISurfaceComposer.cpp @@ -20,10 +20,10 @@ #include <stdint.h> #include <sys/types.h> -#include <utils/Parcel.h> -#include <utils/IMemory.h> -#include <utils/IPCThreadState.h> -#include <utils/IServiceManager.h> +#include <binder/Parcel.h> +#include <binder/IMemory.h> +#include <binder/IPCThreadState.h> +#include <binder/IServiceManager.h> #include <ui/ISurfaceComposer.h> #include <ui/DisplayInfo.h> |