tree ddb15a20cfba9412d8bfd27aac5bcf0c08cd45d2
parent cc3f6a345b0cc356b22f9ea748505ce8a705d358
parent 7bd7dd5d49e21c66c83618cb9f85ef43af29e441
author David 'Digit' Turner <digit@google.com> 1317152176 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317152176 -0700

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

* commit '7bd7dd5d49e21c66c83618cb9f85ef43af29e441':
  emulator: Add <hardware/qemu_pipe.h> header