diff options
| author | 2009-05-22 01:27:01 -0700 | |
|---|---|---|
| committer | 2009-05-22 02:16:08 -0700 | |
| commit | 947f4f4d384ea26eb2145cc070a3eed42c59534a (patch) | |
| tree | edc5fb1e6e808a2b809720f44b6236ebe93b577b /cmds/runtime/ServiceManager.cpp | |
| parent | 6158b1bf0364da1582468a98ec09d004ba99deec (diff) | |
| parent | 0690519fcde1ccb189081aa79df61436f65686c2 (diff) | |
merge master to master_gl
Diffstat (limited to 'cmds/runtime/ServiceManager.cpp')
| -rw-r--r-- | cmds/runtime/ServiceManager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/runtime/ServiceManager.cpp b/cmds/runtime/ServiceManager.cpp index 758a95c07d56..b2bef07ff70e 100644 --- a/cmds/runtime/ServiceManager.cpp +++ b/cmds/runtime/ServiceManager.cpp @@ -9,9 +9,9 @@ #include <utils/Debug.h> #include <utils/Log.h> -#include <utils/Parcel.h> +#include <binder/Parcel.h> #include <utils/String8.h> -#include <utils/ProcessState.h> +#include <binder/ProcessState.h> #include <private/utils/Static.h> |