diff options
| author | 2009-05-22 01:27:01 -0700 | |
|---|---|---|
| committer | 2009-05-22 02:16:08 -0700 | |
| commit | 310f8da0c3122ed5419db8f12a6e98d3188325b2 (patch) | |
| tree | 0f3435d35e7fe8fca8dc2b347ff46276a8c351c8 /libs/ui/LayerState.cpp | |
| parent | 20f68782a4ea71c6a977d7f87d8288d3daa265ec (diff) | |
| parent | bdbf6b094d61f694f162a5a5279caededcb1f0a5 (diff) | |
merge master to master_gl
Diffstat (limited to 'libs/ui/LayerState.cpp')
| -rw-r--r-- | libs/ui/LayerState.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ui/LayerState.cpp b/libs/ui/LayerState.cpp index 0b6374b1ef..a53ffb7941 100644 --- a/libs/ui/LayerState.cpp +++ b/libs/ui/LayerState.cpp @@ -15,7 +15,7 @@ */ #include <utils/Errors.h> -#include <utils/Parcel.h> +#include <binder/Parcel.h> #include <private/ui/LayerState.h> namespace android { |