| commit | 947f4f4d384ea26eb2145cc070a3eed42c59534a | [log] [tgz] |
|---|---|---|
| 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 [diff] [blame] | |
| parent | 0690519fcde1ccb189081aa79df61436f65686c2 [diff] [blame] |
merge master to master_gl
diff --git a/libs/surfaceflinger/LayerBase.cpp b/libs/surfaceflinger/LayerBase.cpp index 4547a83..c678711 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>