| commit | 1ca194d2d4415afbb946d67ae9993b48e74057ef | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@android.com> | Fri Apr 29 15:09:45 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 29 15:09:45 2011 -0700 |
| tree | 828b405365c55ab2956143b3bd55790a423b928d | |
| parent | 1714a2a53f98e2e7a0b77738eb32649aa8c74ac2 [diff] | |
| parent | 05a9b62f315c933e9f92e2fb8ee64f6f8f261d3f [diff] |
am 05a9b62f: am d1be1d02: Merge "<hardware/qemu_pipe.h>: Allow inclusion from C++" * commit '05a9b62f315c933e9f92e2fb8ee64f6f8f261d3f': <hardware/qemu_pipe.h>: Allow inclusion from C++