diff options
| author | 2009-05-22 01:27:01 -0700 | |
|---|---|---|
| committer | 2009-05-22 02:16:08 -0700 | |
| commit | 947f4f4d384ea26eb2145cc070a3eed42c59534a (patch) | |
| tree | edc5fb1e6e808a2b809720f44b6236ebe93b577b /libs/surfaceflinger/LayerBitmap.cpp | |
| parent | 6158b1bf0364da1582468a98ec09d004ba99deec (diff) | |
| parent | 0690519fcde1ccb189081aa79df61436f65686c2 (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 765d90b82ef5..a368ca93aaa6 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> |