commit 947f4f4d384ea26eb2145cc070a3eed42c59534a
author Mathias Agopian <mathias@google.com> Fri May 22 01:27:01 2009 -0700
committer Mathias Agopian <mathias@google.com> Fri May 22 02:16:08 2009 -0700
tree edc5fb1e6e808a2b809720f44b6236ebe93b577b
parent 6158b1bf0364da1582468a98ec09d004ba99deec
parent 0690519fcde1ccb189081aa79df61436f65686c2

merge master to master_gl

libs/surfaceflinger/LayerBitmap.cpp

diff --git a/libs/surfaceflinger/LayerBitmap.cpp b/libs/surfaceflinger/LayerBitmap.cpp
index 765d90b..a368ca9 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>