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/Camera.cpp | |
| parent | 6158b1bf0364da1582468a98ec09d004ba99deec (diff) | |
| parent | 0690519fcde1ccb189081aa79df61436f65686c2 (diff) | |
merge master to master_gl
Diffstat (limited to 'libs/ui/Camera.cpp')
| -rw-r--r-- | libs/ui/Camera.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ui/Camera.cpp b/libs/ui/Camera.cpp index 661370040e44..422830006759 100644 --- a/libs/ui/Camera.cpp +++ b/libs/ui/Camera.cpp @@ -19,9 +19,9 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "Camera" #include <utils/Log.h> -#include <utils/IServiceManager.h> +#include <binder/IServiceManager.h> #include <utils/threads.h> -#include <utils/IMemory.h> +#include <binder/IMemory.h> #include <ui/Surface.h> #include <ui/Camera.h> #include <ui/ICameraService.h> |