commit affee0eb10471d274e6ac7c393706f204945acb4
author David 'Digit' Turner <digit@google.com> Fri Apr 29 12:58:31 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 29 12:58:31 2011 -0700
tree b17fd26accabfcc8124c5a792b5096a9e27131b2
parent b3d7785217d92b45038b2c8a3704cbbbe3971ab0
parent 7db617efc079ccc1f384ef7939f7e8c444dfff7a

am 7db617ef: resolved conflicts for merge of b013bfc1 to honeycomb-plus-aosp

* commit '7db617efc079ccc1f384ef7939f7e8c444dfff7a':
  ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc

rootdir/etc/ueventd.goldfish.rc

diff --git a/rootdir/etc/ueventd.goldfish.rc b/rootdir/etc/ueventd.goldfish.rc
index b5828e7..8de7049 100644
--- 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