diff options
author | 2009-05-22 01:27:01 -0700 | |
---|---|---|
committer | 2009-05-22 02:16:08 -0700 | |
commit | 947f4f4d384ea26eb2145cc070a3eed42c59534a (patch) | |
tree | edc5fb1e6e808a2b809720f44b6236ebe93b577b /libs/ui/SurfaceComposerClient.cpp | |
parent | 6158b1bf0364da1582468a98ec09d004ba99deec (diff) | |
parent | 0690519fcde1ccb189081aa79df61436f65686c2 (diff) |
merge master to master_gl
Diffstat (limited to 'libs/ui/SurfaceComposerClient.cpp')
-rw-r--r-- | libs/ui/SurfaceComposerClient.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ui/SurfaceComposerClient.cpp b/libs/ui/SurfaceComposerClient.cpp index 413167f1ecdf..025bf6e385b0 100644 --- a/libs/ui/SurfaceComposerClient.cpp +++ b/libs/ui/SurfaceComposerClient.cpp @@ -29,8 +29,8 @@ #include <utils/Errors.h> #include <utils/threads.h> #include <utils/KeyedVector.h> -#include <utils/IServiceManager.h> -#include <utils/IMemory.h> +#include <binder/IServiceManager.h> +#include <binder/IMemory.h> #include <utils/Log.h> #include <ui/DisplayInfo.h> |