resolved conflicts for merge of b013bfc1 to honeycomb-plus-aosp

Change-Id: I159dd58c403bc38f9637163d8cd5e6270e4f201c
2011-04-29 13:31:31 +02:00 · 2011-04-29 13:31:31 +02:00 · 7db617efc0
commit 7db617efc0
parent b0d0e260bd b013bfc171
1 changed files with 1 additions and 0 deletions
--- a/rootdir/etc/ueventd.goldfish.rc
+++ b/rootdir/etc/ueventd.goldfish.rc
@ -1,4 +1,5 @@
 # These settings are specific to running under the Android emulator
 /dev/qemu_trace           0666   system     system
+/dev/qemu_pipe            0666   system     system
 /dev/ttyS*                0666   system     system
 /proc                     0666   system     system