OSDN Git Service

am 3c935eda: resolved conflicts for merge of 33fddf0c to gingerbread-plus-aosp
authorDavid 'Digit' Turner <digit@google.com>
Fri, 23 Sep 2011 18:17:34 +0000 (11:17 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 23 Sep 2011 18:17:34 +0000 (11:17 -0700)
* commit '3c935eda2dcd96eda70da6367d705b3b081f6524':
  emulator: Add <hardware/qemu_pipe.h> header


Trivial merge