OSDN Git Service

am 7bd7dd5d: am 3c935eda: resolved conflicts for merge of 33fddf0c to gingerbread...
authorDavid 'Digit' Turner <digit@google.com>
Tue, 27 Sep 2011 19:36:16 +0000 (12:36 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 27 Sep 2011 19:36:16 +0000 (12:36 -0700)
commitcf209523884350a3ad6af5840f1b0ae2dde9b98b
treeddb15a20cfba9412d8bfd27aac5bcf0c08cd45d2
parentcc3f6a345b0cc356b22f9ea748505ce8a705d358
parent7bd7dd5d49e21c66c83618cb9f85ef43af29e441
am 7bd7dd5d: am 3c935eda: resolved conflicts for merge of 33fddf0c to gingerbread-plus-aosp

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