diff options
| author | 2009-05-22 01:27:01 -0700 | |
|---|---|---|
| committer | 2009-05-22 02:16:08 -0700 | |
| commit | 310f8da0c3122ed5419db8f12a6e98d3188325b2 (patch) | |
| tree | 0f3435d35e7fe8fca8dc2b347ff46276a8c351c8 /libs/surfaceflinger/LayerBitmap.cpp | |
| parent | 20f68782a4ea71c6a977d7f87d8288d3daa265ec (diff) | |
| parent | bdbf6b094d61f694f162a5a5279caededcb1f0a5 (diff) | |
merge master to master_gl
Diffstat (limited to 'libs/surfaceflinger/LayerBitmap.cpp')
| -rw-r--r-- | libs/surfaceflinger/LayerBitmap.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/surfaceflinger/LayerBitmap.cpp b/libs/surfaceflinger/LayerBitmap.cpp index 765d90b82e..a368ca93aa 100644 --- a/libs/surfaceflinger/LayerBitmap.cpp +++ b/libs/surfaceflinger/LayerBitmap.cpp @@ -20,9 +20,9 @@ #include <utils/Errors.h> #include <utils/Log.h> -#include <utils/MemoryDealer.h> -#include <utils/MemoryBase.h> -#include <utils/IMemory.h> +#include <binder/MemoryDealer.h> +#include <binder/MemoryBase.h> +#include <binder/IMemory.h> #include <ui/PixelFormat.h> #include <ui/Surface.h> |