auto import from //branches/cupcake/...@131421
diff --git a/include/hardware/copybit.h b/include/hardware/copybit.h
index 15b5ebe..7774cd2 100644
--- a/include/hardware/copybit.h
+++ b/include/hardware/copybit.h
@@ -63,15 +63,15 @@
 /* values for copybit_set_parameter(COPYBIT_TRANSFORM) */
 enum {
     /* flip source image horizontally */
-    COPYBIT_TRANSFORM_FLIP_H    = 0x01,
+    COPYBIT_TRANSFORM_FLIP_H    = HAL_TRANSFORM_FLIP_H,
     /* flip source image vertically */
-    COPYBIT_TRANSFORM_FLIP_V    = 0x02,
+    COPYBIT_TRANSFORM_FLIP_V    = HAL_TRANSFORM_FLIP_V,
     /* rotate source image 90 degres */
-    COPYBIT_TRANSFORM_ROT_90    = 0x04,
+    COPYBIT_TRANSFORM_ROT_90    = HAL_TRANSFORM_ROT_90,
     /* rotate source image 180 degres */
-    COPYBIT_TRANSFORM_ROT_180   = 0x03,
+    COPYBIT_TRANSFORM_ROT_180   = HAL_TRANSFORM_ROT_180,
     /* rotate source image 270 degres */
-    COPYBIT_TRANSFORM_ROT_270   = 0x07,
+    COPYBIT_TRANSFORM_ROT_270   = HAL_TRANSFORM_ROT_270,
 };
 
 /* enable/disable value copybit_set_parameter */
diff --git a/include/hardware/hardware.h b/include/hardware/hardware.h
index e480675..5325744 100644
--- a/include/hardware/hardware.h
+++ b/include/hardware/hardware.h
@@ -125,6 +125,24 @@
     HAL_PIXEL_FORMAT_YCbCr_420_I  = 0x15
 };
 
+
+/**
+ * Transformation definitions
+ */
+
+enum {
+    /* flip source image horizontally */
+    HAL_TRANSFORM_FLIP_H    = 0x01,
+    /* flip source image vertically */
+    HAL_TRANSFORM_FLIP_V    = 0x02,
+    /* rotate source image 90 degres */
+    HAL_TRANSFORM_ROT_90    = 0x04,
+    /* rotate source image 180 degres */
+    HAL_TRANSFORM_ROT_180   = 0x03,
+    /* rotate source image 270 degres */
+    HAL_TRANSFORM_ROT_270   = 0x07,
+};
+
 __END_DECLS
 
 #endif  /* ANDROID_INCLUDE_HARDWARE_HARDWARE_H */
diff --git a/include/hardware/overlay.h b/include/hardware/overlay.h
index c5d43cb..92992d1 100644
--- a/include/hardware/overlay.h
+++ b/include/hardware/overlay.h
@@ -52,15 +52,15 @@
 /* values for copybit_set_parameter(OVERLAY_TRANSFORM) */
 enum {
     /* flip source image horizontally */
-    OVERLAY_TRANSFORM_FLIP_H    = 0x01,
+    OVERLAY_TRANSFORM_FLIP_H    = HAL_TRANSFORM_FLIP_V,
     /* flip source image vertically */
-    OVERLAY_TRANSFORM_FLIP_V    = 0x02,
+    OVERLAY_TRANSFORM_FLIP_V    = HAL_TRANSFORM_FLIP_H,
     /* rotate source image 90 degrees */
-    OVERLAY_TRANSFORM_ROT_90    = 0x04,
+    OVERLAY_TRANSFORM_ROT_90    = HAL_TRANSFORM_ROT_90,
     /* rotate source image 180 degrees */
-    OVERLAY_TRANSFORM_ROT_180   = 0x03,
+    OVERLAY_TRANSFORM_ROT_180   = HAL_TRANSFORM_ROT_180,
     /* rotate source image 270 degrees */
-    OVERLAY_TRANSFORM_ROT_270   = 0x07,
+    OVERLAY_TRANSFORM_ROT_270   = HAL_TRANSFORM_ROT_270
 };
 
 /* names for setParameter() */