diff -Nru android-headers-4.2.2-1/debian/changelog android-headers-4.2.2-2/debian/changelog
--- android-headers-4.2.2-1/debian/changelog	2013-12-15 22:55:09.000000000 +0000
+++ android-headers-4.2.2-2/debian/changelog	2013-12-20 01:07:16.000000000 +0000
@@ -1,3 +1,9 @@
+android-headers (4.2.2-2-0ubuntu1) trusty; urgency=low
+
+  * Syncing hardware/gralloc.h and hardware/hardware.h with AOSP-4.2.2_r1.2
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>  Thu, 19 Dec 2013 23:05:59 -0200
+
 android-headers (4.2.2-1-0ubuntu2) trusty; urgency=low
 
   * Changing breaks to conflicts, following policy so the older package is
diff -Nru android-headers-4.2.2-1/hardware/gralloc.h android-headers-4.2.2-2/hardware/gralloc.h
--- android-headers-4.2.2-1/hardware/gralloc.h	2013-12-05 02:57:44.000000000 +0000
+++ android-headers-4.2.2-2/hardware/gralloc.h	2013-12-20 01:05:06.000000000 +0000
@@ -76,8 +76,16 @@
     GRALLOC_USAGE_HW_FB                 = 0x00001000,
     /* buffer will be used with the HW video encoder */
     GRALLOC_USAGE_HW_VIDEO_ENCODER      = 0x00010000,
+    /* buffer will be written by the HW camera pipeline */
+    GRALLOC_USAGE_HW_CAMERA_WRITE       = 0x00020000,
+    /* buffer will be read by the HW camera pipeline */
+    GRALLOC_USAGE_HW_CAMERA_READ        = 0x00040000,
+    /* buffer will be used as part of zero-shutter-lag queue */
+    GRALLOC_USAGE_HW_CAMERA_ZSL         = 0x00060000,
+    /* mask for the camera access values */
+    GRALLOC_USAGE_HW_CAMERA_MASK        = 0x00060000,
     /* mask for the software usage bit-mask */
-    GRALLOC_USAGE_HW_MASK               = 0x00011F00,
+    GRALLOC_USAGE_HW_MASK               = 0x00071F00,
 
     /* buffer should be displayed full-screen on an external display when
      * possible
diff -Nru android-headers-4.2.2-1/hardware/hardware.h android-headers-4.2.2-2/hardware/hardware.h
--- android-headers-4.2.2-1/hardware/hardware.h	2013-12-05 02:58:58.000000000 +0000
+++ android-headers-4.2.2-2/hardware/hardware.h	2013-12-20 01:05:15.000000000 +0000
@@ -37,6 +37,12 @@
 #define HARDWARE_MAKE_API_VERSION(maj,min) \
             ((((maj) & 0xff) << 8) | ((min) & 0xff))
 
+#define HARDWARE_MAKE_API_VERSION_2(maj,min,hdr) \
+            ((((maj) & 0xff) << 24) | (((min) & 0xff) << 16) | ((hdr) & 0xffff))
+#define HARDWARE_API_VERSION_2_MAJ_MIN_MASK 0xffff0000
+#define HARDWARE_API_VERSION_2_HEADER_MASK  0x0000ffff
+
+
 /*
  * The current HAL API version.
  *
@@ -60,11 +66,13 @@
  * Use this macro to set the hw_module_t.module_api_version field.
  */
 #define HARDWARE_MODULE_API_VERSION(maj,min) HARDWARE_MAKE_API_VERSION(maj,min)
+#define HARDWARE_MODULE_API_VERSION_2(maj,min,hdr) HARDWARE_MAKE_API_VERSION_2(maj,min,hdr)
 
 /*
  * Use this macro to set the hw_device_t.version field
  */
 #define HARDWARE_DEVICE_API_VERSION(maj,min) HARDWARE_MAKE_API_VERSION(maj,min)
+#define HARDWARE_DEVICE_API_VERSION_2(maj,min,hdr) HARDWARE_MAKE_API_VERSION_2(maj,min,hdr)
 
 struct hw_module_t;
 struct hw_module_methods_t;