am 3c935eda: resolved conflicts for merge of 33fddf0c to gingerbread-plus-aosp

* commit '3c935eda2dcd96eda70da6367d705b3b081f6524':
  emulator: Add <hardware/qemu_pipe.h> header
diff --git a/include/hardware/qemu_pipe.h b/include/hardware/qemu_pipe.h
index 000c99e..1a67022 100644
--- a/include/hardware/qemu_pipe.h
+++ b/include/hardware/qemu_pipe.h
@@ -68,7 +68,7 @@
     fd = open("/dev/qemu_pipe", O_RDWR);
     if (fd < 0) {
         D("%s: Could not open /dev/qemu_pipe: %s", __FUNCTION__, strerror(errno));
-        errno = ENOSYS;
+        //errno = ENOSYS;
         return -1;
     }