| commit | 7bd7dd5d49e21c66c83618cb9f85ef43af29e441 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Fri Sep 23 11:17:34 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 23 11:17:34 2011 -0700 |
| tree | 7df8bafb0bc17af9a238e611ebf2b8cec2ce2f54 | |
| parent | 73bff7f3fddf182bc51a0e20096b76d9e0d877ad [diff] | |
| parent | 3c935eda2dcd96eda70da6367d705b3b081f6524 [diff] |
am 3c935eda: resolved conflicts for merge of 33fddf0c to gingerbread-plus-aosp * commit '3c935eda2dcd96eda70da6367d705b3b081f6524': emulator: Add <hardware/qemu_pipe.h> header