From: David 'Digit' Turner <digit@google.com>
Date: Fri, 23 Sep 2011 18:17:34 +0000 (-0700)
Subject: am 3c935eda: resolved conflicts for merge of 33fddf0c to gingerbread-plus-aosp
X-Git-Tag: android-x86-4.4-r1~344^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7bd7dd5d49e21c66c83618cb9f85ef43af29e441;p=android-x86%2Fhardware-libhardware.git

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

* commit '3c935eda2dcd96eda70da6367d705b3b081f6524':
  emulator: Add <hardware/qemu_pipe.h> header
---

7bd7dd5d49e21c66c83618cb9f85ef43af29e441