am 2284ef40: am 15b6cc56: am b4b448a9: am 97dba6cf: Merge "emulator gralloc: removed compilation warnings."

* commit '2284ef400c8e94c782e3c4d392bf6767fb1f1d85':
  emulator gralloc: removed compilation warnings.

tools/emulator/opengl/system/gralloc/gralloc.cpp

@@ -712,11 +712,15 @@ struct private_module_t HAL_MODULE_INFO_SYM = {
             id: GRALLOC_HARDWARE_MODULE_ID,
             name: "Graphics Memory Allocator Module",
             author: "The Android Open Source Project",
-            methods: &gralloc_module_methods
+            methods: &gralloc_module_methods,
+            dso: NULL,
+            reserved: {0, }
         },
         registerBuffer: gralloc_register_buffer,
         unregisterBuffer: gralloc_unregister_buffer,
         lock: gralloc_lock,
         unlock: gralloc_unlock,
+        perform: NULL,
+        reserved_proc : {NULL, }
     }
 };