summaryrefslogtreecommitdiff
path: root/libs/surfaceflinger/LayerBase.cpp
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2009-05-22 01:27:01 -0700
committer Mathias Agopian <mathias@google.com> 2009-05-22 02:16:08 -0700
commit947f4f4d384ea26eb2145cc070a3eed42c59534a (patch)
treeedc5fb1e6e808a2b809720f44b6236ebe93b577b /libs/surfaceflinger/LayerBase.cpp
parent6158b1bf0364da1582468a98ec09d004ba99deec (diff)
parent0690519fcde1ccb189081aa79df61436f65686c2 (diff)
merge master to master_gl
Diffstat (limited to 'libs/surfaceflinger/LayerBase.cpp')
-rw-r--r--libs/surfaceflinger/LayerBase.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/surfaceflinger/LayerBase.cpp b/libs/surfaceflinger/LayerBase.cpp
index 4547a8344f9e..c678711a5439 100644
--- a/libs/surfaceflinger/LayerBase.cpp
+++ b/libs/surfaceflinger/LayerBase.cpp
@@ -20,8 +20,8 @@
#include <utils/Errors.h>
#include <utils/Log.h>
-#include <utils/IPCThreadState.h>
-#include <utils/IServiceManager.h>
+#include <binder/IPCThreadState.h>
+#include <binder/IServiceManager.h>
#include <GLES/gl.h>
#include <GLES/glext.h>