diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-22 01:27:01 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-22 02:16:08 -0700 |
| commit | 947f4f4d384ea26eb2145cc070a3eed42c59534a (patch) | |
| tree | edc5fb1e6e808a2b809720f44b6236ebe93b577b /libs/surfaceflinger/purgatory | |
| parent | 6158b1bf0364da1582468a98ec09d004ba99deec (diff) | |
| parent | 0690519fcde1ccb189081aa79df61436f65686c2 (diff) | |
| download | frameworks_base-947f4f4d384ea26eb2145cc070a3eed42c59534a.zip frameworks_base-947f4f4d384ea26eb2145cc070a3eed42c59534a.tar.gz frameworks_base-947f4f4d384ea26eb2145cc070a3eed42c59534a.tar.bz2 | |
merge master to master_gl
Diffstat (limited to 'libs/surfaceflinger/purgatory')
| -rw-r--r-- | libs/surfaceflinger/purgatory/LayerOrientationAnim.h | 2 | ||||
| -rw-r--r-- | libs/surfaceflinger/purgatory/LayerOrientationAnimRotate.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/surfaceflinger/purgatory/LayerOrientationAnim.h b/libs/surfaceflinger/purgatory/LayerOrientationAnim.h index 472c45a..a1a2654 100644 --- a/libs/surfaceflinger/purgatory/LayerOrientationAnim.h +++ b/libs/surfaceflinger/purgatory/LayerOrientationAnim.h @@ -20,7 +20,7 @@ #include <stdint.h> #include <sys/types.h> #include <utils/threads.h> -#include <utils/Parcel.h> +#include <binder/Parcel.h> #include "LayerBase.h" #include "LayerBitmap.h" diff --git a/libs/surfaceflinger/purgatory/LayerOrientationAnimRotate.h b/libs/surfaceflinger/purgatory/LayerOrientationAnimRotate.h index a675c79..a88eec0 100644 --- a/libs/surfaceflinger/purgatory/LayerOrientationAnimRotate.h +++ b/libs/surfaceflinger/purgatory/LayerOrientationAnimRotate.h @@ -20,7 +20,7 @@ #include <stdint.h> #include <sys/types.h> #include <utils/threads.h> -#include <utils/Parcel.h> +#include <binder/Parcel.h> #include "LayerBase.h" #include "LayerBitmap.h" |